summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES2
-rw-r--r--Makefile.am4
-rw-r--r--build.c27
-rw-r--r--build/build.c29
-rw-r--r--build/names.c51
-rw-r--r--build/pack.c8
-rw-r--r--build/rpmbuild.h48
-rw-r--r--configure.in2
-rw-r--r--lib/header.h7
-rw-r--r--lib/rpminstall.c1
-rw-r--r--lib/rpmlead.c2
-rw-r--r--lib/rpmlib.h43
-rw-r--r--lib/rpmrc.c29
-rw-r--r--macros.in11
-rw-r--r--po/cs.po948
-rw-r--r--po/da.po946
-rw-r--r--po/de.po909
-rw-r--r--po/es.po887
-rw-r--r--po/fi.po910
-rw-r--r--po/fr.po911
-rw-r--r--po/gl.po887
-rw-r--r--po/hu.po887
-rw-r--r--po/id.po887
-rw-r--r--po/is.po937
-rw-r--r--po/it.po887
-rw-r--r--po/ja.po915
-rw-r--r--po/ko.po887
-rw-r--r--po/no.po940
-rw-r--r--po/pl.po923
-rw-r--r--po/pt.po891
-rw-r--r--po/pt_BR.po902
-rw-r--r--po/ro.po887
-rw-r--r--po/rpm.pot887
-rw-r--r--po/ru.po947
-rw-r--r--po/sk.po924
-rw-r--r--po/sl.po928
-rw-r--r--po/sr.po910
-rw-r--r--po/sv.po948
-rw-r--r--po/tr.po909
-rw-r--r--po/uk.po887
-rw-r--r--po/wa.po887
-rw-r--r--po/zh.po887
-rw-r--r--po/zh_CN.GB2312.po887
-rwxr-xr-xrpm.c10
-rw-r--r--rpmio/macro.c23
-rw-r--r--rpmio/rpmerr.h11
-rw-r--r--rpmio/rpmmacro.h45
-rwxr-xr-xrpmqv.c52
48 files changed, 14835 insertions, 11912 deletions
diff --git a/CHANGES b/CHANGES
index ee6ab92c2..8529af7ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@
- consistent return for all signature verification.
- use enums for almost all rpmlib #define's.
- API: change rpmProblem typedef to pass by reference, not value.
+ - unify rpmError and rpmMessge interfaces through rpmlog.
+ - collect and display rpm build error messages at end of build.
3.0.6 -> 4.0
- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.
diff --git a/Makefile.am b/Makefile.am
index af87d3bed..71d2672fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,7 +134,6 @@ install-data-local:
@case "@build_os@" in \
mint) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/m68kmint ;;\
solaris*|linux*) \
- chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ; \
$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/@build_cpu@ ;;\
*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/@build_cpu@ ;;\
esac
@@ -144,6 +143,9 @@ install-data-local:
@$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SRPMS
@$(mkinstalldirs) $(DESTDIR)/var/tmp
+#chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ; \
+#
+
.PHONY: tar
tar:
rm -rf /tmp/rpm-$(VERSION)
diff --git a/build.c b/build.c
index bce60d489..a16525bff 100644
--- a/build.c
+++ b/build.c
@@ -22,7 +22,7 @@ static int checkSpec(Header h)
if (rpmdbOpen(rootdir, &db, mode, 0644)) {
const char *dn;
dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL);
- rpmMessage(RPMMESS_ERROR, _("cannot open %s/packages.rpm\n"), dn);
+ rpmError(RPMERR_OPEN, _("cannot open %s/packages.rpm\n"), dn);
xfree(dn);
exit(EXIT_FAILURE);
}
@@ -61,7 +61,7 @@ static int isSpecFile(const char *specfile)
fd = Fopen(specfile, "r.ufdio");
if (fd == NULL || Ferror(fd)) {
- fprintf(stderr, _("Unable to open spec file %s: %s\n"), specfile, Fstrerror(fd));
+ rpmError(RPMERR_OPEN, _("Unable to open spec file %s: %s\n"), specfile, Fstrerror(fd));
return 0;
}
count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd);
@@ -123,8 +123,7 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
sprintf(cmd, "%s < %s | tar xOvf - Specfile 2>&1 > %s",
zcmds[res & 0x3], arg, tmpSpecFile);
if (!(fp = popen(cmd, "r"))) {
- fprintf(stderr, _("Failed to open tar pipe: %s\n"),
- strerror(errno));
+ rpmError(RPMERR_POPEN, _("Failed to open tar pipe: %m"));
xfree(specDir);
xfree(tmpSpecFile);
return 1;
@@ -136,15 +135,14 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
sprintf(cmd, "%s < %s | tar xOvf - \\*.spec 2>&1 > %s",
zcmds[res & 0x3], arg, tmpSpecFile);
if (!(fp = popen(cmd, "r"))) {
- fprintf(stderr, _("Failed to open tar pipe: %s\n"),
- strerror(errno));
+ rpmError(RPMERR_POPEN, _("Failed to open tar pipe: %m"));
xfree(specDir);
xfree(tmpSpecFile);
return 1;
}
if (!fgets(buf, sizeof(buf) - 1, fp)) {
/* Give up */
- fprintf(stderr, _("Failed to read spec file from %s\n"), arg);
+ rpmError(RPMERR_READ, _("Failed to read spec file from %s"), arg);
unlink(tmpSpecFile);
xfree(specDir);
xfree(tmpSpecFile);
@@ -171,8 +169,8 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
xfree(specDir);
if (res) {
- fprintf(stderr, _("Failed to rename %s to %s: %s\n"),
- tmpSpecFile, s, strerror(errno));
+ rpmError(RPMERR_RENAME, _("Failed to rename %s to %s: %m"),
+ tmpSpecFile, s);
unlink(tmpSpecFile);
xfree(tmpSpecFile);
return 1;
@@ -209,16 +207,21 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
if (specut != URL_IS_DASH) {
struct stat st;
- Stat(specURL, &st);
+ if (Stat(specURL, &st) < 0) {
+ rpmError(RPMERR_STAT, _("failed to stat %s: %m"), specURL);
+ rc = 1;
+ goto exit;
+ }
if (! S_ISREG(st.st_mode)) {
- fprintf(stderr, _("File is not a regular file: %s\n"), specURL);
+ rpmError(RPMERR_NOTREG, _("File %s is not a regular file."),
+ specURL);
rc = 1;
goto exit;
}
/* Try to verify that the file is actually a specfile */
if (!isSpecFile(specURL)) {
- fprintf(stderr, _("File %s does not appear to be a specfile.\n"),
+ rpmError(RPMERR_BADSPEC, _("File %s does not appear to be a specfile."),
specURL);
rc = 1;
goto exit;
diff --git a/build/build.c b/build/build.c
index 721a4a643..9f0da56bc 100644
--- a/build/build.c
+++ b/build/build.c
@@ -249,46 +249,46 @@ int buildSpec(Spec spec, int what, int test)
(what & ~RPMBUILD_RMSOURCE) |
(x ? 0 : (what & RPMBUILD_PACKAGESOURCE)),
test))) {
- return rc;
+ goto exit;
}
}
} else {
if ((what & RPMBUILD_PREP) &&
(rc = doScript(spec, RPMBUILD_PREP, NULL, NULL, test)))
- return rc;
+ goto exit;
if ((what & RPMBUILD_BUILD) &&
(rc = doScript(spec, RPMBUILD_BUILD, NULL, NULL, test)))
- return rc;
+ goto exit;
if ((what & RPMBUILD_INSTALL) &&
(rc = doScript(spec, RPMBUILD_INSTALL, NULL, NULL, test)))
- return rc;
+ goto exit;
if ((what & RPMBUILD_PACKAGESOURCE) &&
(rc = processSourceFiles(spec)))
- return rc;
+ goto exit;
if (((what & RPMBUILD_INSTALL) || (what & RPMBUILD_PACKAGEBINARY) ||
(what & RPMBUILD_FILECHECK)) &&
(rc = processBinaryFiles(spec, what & RPMBUILD_INSTALL, test)))
- return rc;
+ goto exit;
if (((what & RPMBUILD_PACKAGESOURCE) && !test) &&
(rc = packageSources(spec)))
- return rc;
+ goto exit;
if (((what & RPMBUILD_PACKAGEBINARY) && !test) &&
(rc = packageBinaries(spec)))
- return rc;
+ goto exit;
if ((what & RPMBUILD_CLEAN) &&
(rc = doScript(spec, RPMBUILD_CLEAN, NULL, NULL, test)))
- return rc;
+ goto exit;
if ((what & RPMBUILD_RMBUILD) &&
(rc = doScript(spec, RPMBUILD_RMBUILD, NULL, NULL, test)))
- return rc;
+ goto exit;
}
if (what & RPMBUILD_RMSOURCE)
@@ -296,6 +296,13 @@ int buildSpec(Spec spec, int what, int test)
if (what & RPMBUILD_RMSPEC)
unlink(spec->specFile);
+ rc = 0;
- return 0;
+exit:
+ if (rc && rpmlogGetNrecs() > 0) {
+ rpmMessage(RPMMESS_NORMAL, _("\n\nRPM build errors:\n"));
+ rpmlogPrint(NULL);
+ }
+
+ return rc;
}
diff --git a/build/names.c b/build/names.c
index c49349103..7aa5399d7 100644
--- a/build/names.c
+++ b/build/names.c
@@ -16,7 +16,6 @@ static gid_t gids[1024];
/*@owned@*/ /*@null@*/ static const char *gnames[1024];
static int gid_used = 0;
-/** */
void freeNames(void)
{
int x;
@@ -26,11 +25,6 @@ void freeNames(void)
xfree(gnames[x]);
}
-/*
- * getUname() takes a uid, gets the username, and creates an entry in the
- * table to hold a string containing the user name.
- */
-/** */
const char *getUname(uid_t uid)
{
struct passwd *pw;
@@ -43,10 +37,8 @@ const char *getUname(uid_t uid)
}
/* XXX - This is the other hard coded limit */
- if (x == 1024) {
- fprintf(stderr, _("RPMERR_INTERNAL: Hit limit in getUname()\n"));
- exit(EXIT_FAILURE);
- }
+ if (x == 1024)
+ rpmlog(RPMLOG_CRIT, _("getUname: too many uid's\n"));
pw = getpwuid(uid);
uids[x] = uid;
@@ -59,11 +51,6 @@ const char *getUname(uid_t uid)
return unames[x];
}
-/*
- * getUnameS() takes a username, gets the uid, and creates an entry in the
- * table to hold a string containing the user name.
- */
-/** */
const char *getUnameS(const char *uname)
{
struct passwd *pw;
@@ -76,10 +63,8 @@ const char *getUnameS(const char *uname)
}
/* XXX - This is the other hard coded limit */
- if (x == 1024) {
- fprintf(stderr, _("RPMERR_INTERNAL: Hit limit in getUname()\n"));
- exit(EXIT_FAILURE);
- }
+ if (x == 1024)
+ rpmlog(RPMLOG_CRIT, _("getUnameS: too many uid's\n"));
pw = getpwnam(uname);
uid_used++;
@@ -93,11 +78,6 @@ const char *getUnameS(const char *uname)
return unames[x];
}
-/*
- * getGname() takes a gid, gets the group name, and creates an entry in the
- * table to hold a string containing the group name.
- */
-/** */
const char *getGname(gid_t gid)
{
struct group *gr;
@@ -110,10 +90,8 @@ const char *getGname(gid_t gid)
}
/* XXX - This is the other hard coded limit */
- if (x == 1024) {
- fprintf(stderr, _("RPMERR_INTERNAL: Hit limit in getGname()\n"));
- exit(EXIT_FAILURE);
- }
+ if (x == 1024)
+ rpmlog(RPMLOG_CRIT, _("getGname: too many gid's\n"));
gr = getgrgid(gid);
gids[x] = gid;
@@ -126,11 +104,6 @@ const char *getGname(gid_t gid)
return gnames[x];
}
-/*
- * getGnameS() takes a group name, gets the gid, and creates an entry in the
- * table to hold a string containing the group name.
- */
-/** */
const char *getGnameS(const char *gname)
{
struct group *gr;
@@ -143,10 +116,8 @@ const char *getGnameS(const char *gname)
}
/* XXX - This is the other hard coded limit */
- if (x == 1024) {
- fprintf(stderr, _("RPMERR_INTERNAL: Hit limit in getGname()\n"));
- exit(EXIT_FAILURE);
- }
+ if (x == 1024)
+ rpmlog(RPMLOG_CRIT, _("getGnameS: too many gid's\n"));
gr = getgrnam(gname);
gid_used++;
@@ -160,19 +131,15 @@ const char *getGnameS(const char *gname)
return gnames[x];
}
-/** */
time_t *const getBuildTime(void)
{
static time_t buildTime = 0;
- if (! buildTime) {
+ if (! buildTime)
buildTime = time(NULL);
- }
-
return &buildTime;
}
-/** */
const char *const buildHost(void)
{
static char hostname[1024];
diff --git a/build/pack.c b/build/pack.c
index f5463b78e..7d3380068 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -465,24 +465,24 @@ int writeRPM(Header h, const char *fileName, int type,
/* Append the header and archive */
ifd = Fopen(sigtarget, "r.ufdio");
if (ifd == NULL || Ferror(ifd)) {
- rpmError(RPMERR_READERROR, _("Unable to open sigtarget %s: %s"),
+ rpmError(RPMERR_READ, _("Unable to open sigtarget %s: %s"),
sigtarget, Fstrerror(ifd));
Fclose(fd);
Unlink(sigtarget);
xfree(sigtarget);
Unlink(fileName);
- return RPMERR_READERROR;
+ return RPMERR_READ;
}
while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), ifd)) > 0) {
if (count == -1) {
- rpmError(RPMERR_READERROR, _("Unable to read sigtarget %s: %s"),
+ rpmError(RPMERR_READ, _("Unable to read sigtarget %s: %s"),
sigtarget, Fstrerror(ifd));
Fclose(ifd);
Fclose(fd);
unlink(sigtarget);
xfree(sigtarget);
unlink(fileName);
- return RPMERR_READERROR;
+ return RPMERR_READ;
}
if (Fwrite(buf, sizeof(buf[0]), count, fd) < 0) {
rpmError(RPMERR_NOSPACE, _("Unable to write package %s: %s"),
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 8ef2ea58a..75c2581e8 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -77,29 +77,55 @@ typedef enum rpmParseState_e {
extern "C" {
#endif
-/* from build/names.h */
-
-/** */
+/**
+ * Destroy uid/gid caches.
+ */
void freeNames(void);
-/** */
+/**
+ * Return cached user name from user id.
+ * @todo Implement using hash.
+ * @param user id
+ * @return cached user name
+ */
/*@observer@*/ const char *getUname(uid_t uid);
-/** */
+/**
+ * Return cached user name.
+ * @todo Implement using hash.
+ * @param user name
+ * @return cached user name
+ */
/*@observer@*/ const char *getUnameS(const char *uname);
-/** */
+/**
+ * Return cached group name from group id.
+ * @todo Implement using hash.
+ * @param group id
+ * @return cached group name
+ */
/*@observer@*/ const char *getGname(gid_t gid);
-/** */
+/**
+ * Return cached group name.
+ * @todo Implement using hash.
+ * @param group name
+ * @return cached group name
+ */
/*@observer@*/ const char *getGnameS(const char *gname);
-/** */
-/*@observer@*/ const char *const buildHost(void);
-
-/** */
+/**
+ * Return build time stamp.
+ * @return build time stamp
+ */
/*@observer@*/ time_t *const getBuildTime(void);
+/**
+ * Return build hostname.
+ * @return build hostname
+ */
+/*@observer@*/ const char *const buildHost(void);
+
/* from build/read.h */
/**
diff --git a/configure.in b/configure.in
index d22857796..2cf9761fd 100644
--- a/configure.in
+++ b/configure.in
@@ -916,7 +916,7 @@ SYSCONFIGDIR="`echo /etc/rpm`"
AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR")
AC_SUBST(SYSCONFIGDIR)
-MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/macros.specspo:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
+MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target_platform}/macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/macros.specspo:${SYSCONFIGDIR}/%{_target_platform}/macros:~/.rpmmacros"
AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES")
AC_SUBST(MACROFILES)
diff --git a/lib/header.h b/lib/header.h
index 7d03bd9cd..d57a2c3e2 100644
--- a/lib/header.h
+++ b/lib/header.h
@@ -435,7 +435,10 @@ void headerCopyTags(Header headerFrom, Header headerTo, int_32 *tagstocopy)
#define RPM_MIN_TYPE 0
-enum tagTypes {
+/**
+ * @todo Add RPM_XREF_TYPE to carry (hdrNum,tagNum,valNum) cross reference.
+ */
+typedef enum rpmTagType_e {
RPM_NULL_TYPE = 0,
RPM_CHAR_TYPE = 1,
RPM_INT8_TYPE = 2,
@@ -446,7 +449,7 @@ enum tagTypes {
RPM_BIN_TYPE = 7,
RPM_STRING_ARRAY_TYPE = 8,
RPM_I18NSTRING_TYPE = 9
-};
+} rpmTagType;
#define RPM_MAX_TYPE 9
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 309278e60..17b4d15da 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -97,6 +97,7 @@ static void * showProgress(const void * arg, const rpmCallbackType what,
return rc;
}
+/** @todo Generalize --freshen policies. */
int rpmInstall(const char * rootdir, const char ** fileArgv,
rpmtransFlags transFlags,
rpmInstallInterfaceFlags interfaceFlags,
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 89154b139..7d55a7923 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -49,7 +49,7 @@ int writeLead(FD_t fd, struct rpmlead *lead)
int readLead(FD_t fd, struct rpmlead *lead)
{
if (timedRead(fd, (char *)lead, sizeof(*lead)) != sizeof(*lead)) {
- rpmError(RPMERR_READERROR, _("read failed: %s (%d)"), Fstrerror(fd),
+ rpmError(RPMERR_READ, _("read failed: %s (%d)"), Fstrerror(fd),
errno);
return 1;
}
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 783865f93..eb963dfee 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -339,8 +339,8 @@ typedef enum rpmsenseFlags_e {
/* ==================================================================== */
/** \name RPMRC */
/*@{*/
-/* Stuff for maintaining "variables" like SOURCEDIR, BUILDDIR, etc */
+/* Stuff for maintaining "variables" like SOURCEDIR, BUILDDIR, etc */
#define RPMVAR_OPTFLAGS 3
#define RPMVAR_PROVIDES 38
#define RPMVAR_INCLUDE 43
@@ -349,18 +349,9 @@ typedef enum rpmsenseFlags_e {
#define RPMVAR_NUM 55 /* number of RPMVAR entries */
/** \ingroup rpmrc
- * Return value of rpmrc variable.
- * @deprecated Use rpmExpand() with appropriate macro expression.
- * @todo Eliminate from API.
+ * List of macro files to read for configuring rpm.
*/
-const char * rpmGetVar(int var);
-
-/** \ingroup rpmrc
- * Set value of rpmrc variable.
- * @deprecated Use rpmDefineMacro() to change appropriate macro instead.
- * @todo Eliminate from API.
- */
-void rpmSetVar(int var, const char *val);
+const char * macrofiles;
/** \ingroup rpmrc
* Build and install arch/os table identifiers.
@@ -375,7 +366,7 @@ enum rpm_machtable_e {
#define RPM_MACHTABLE_COUNT 4 /* number of arch/os tables */
/** \ingroup rpmrc
- * Read rpmrc (and macro) configuration file(s) for a target.
+ * Read macro configuration file(s) for a target.
* @param file colon separated files to read (NULL uses default)
* @param target target platform (NULL uses default)
* @return 0 on success, -1 on error
@@ -383,19 +374,16 @@ enum rpm_machtable_e {
int rpmReadConfigFiles(const char * file, const char * target);
/** \ingroup rpmrc
- * Read rpmrc (and macro) configuration file(s).
- * @param file colon separated files to read (NULL uses default)
- * @return 0 on succes
- */
-int rpmReadRC(const char * file);
-
-/** \ingroup rpmrc
* Return current arch name and/or number.
* @todo Generalize to extract arch component from target_platform macro.
* @retval name address of arch name (or NULL)
* @retval num address of arch number (or NULL)
*/
void rpmGetArchInfo( /*@out@*/ const char ** name, /*@out@*/ int * num);
+void XrpmGetArchInfo( /*@out@*/ const char ** name, /*@out@*/ int * num,
+ const char * _f, unsigned _l);
+#define rpmGetArchInfo(_name, _num) \
+ XrpmGetArchInfo(_name, _num, __FILE__, __LINE__)
/** \ingroup rpmrc
* Return current os name and/or number.
@@ -404,6 +392,10 @@ void rpmGetArchInfo( /*@out@*/ const char ** name, /*@out@*/ int * num);
* @retval num address of os number (or NULL)
*/
void rpmGetOsInfo( /*@out@*/ const char ** name, /*@out@*/ int * num);
+void XrpmGetOsInfo( /*@out@*/ const char ** name, /*@out@*/ int * num,
+ const char * _f, unsigned _l);
+#define rpmGetOsInfo(_name, _num) \
+ XrpmGetOsInfo(_name, _num, __FILE__, __LINE__)
/** \ingroup rpmrc
* Return arch/os score of a name.
@@ -419,6 +411,9 @@ void rpmGetOsInfo( /*@out@*/ const char ** name, /*@out@*/ int * num);
* @return arch score
*/
int rpmMachineScore(int type, const char * name);
+int XrpmMachineScore(int type, const char * name, const char *_f, unsigned _l);
+#define rpmMachineScore(_type, _name) \
+ XrpmMachineScore(_type, _name, __FILE__, __LINE__)
/** \ingroup rpmrc
* Display current rpmrc (and macro) configuration.
@@ -446,6 +441,10 @@ void rpmSetTables(int archTable, int osTable); /* only used by build code */
* @param os os name (or NULL)
*/
void rpmSetMachine(const char * arch, const char * os);
+void XrpmSetMachine( /*@out@*/ const char *arch, /*@out@*/ const char *os,
+ const char *_f, unsigned _l);
+#define rpmSetMachine(_arch, _os) \
+ XrpmSetMachine(_arch, _os, __FILE__, __LINE__)
/** \ingroup rpmrc
* Return current arch/os names.
@@ -456,6 +455,10 @@ void rpmSetMachine(const char * arch, const char * os);
* @retval os address of os name (or NULL)
*/
void rpmGetMachine( /*@out@*/ const char **arch, /*@out@*/ const char **os);
+void XrpmGetMachine( /*@out@*/ const char **arch, /*@out@*/ const char **os,
+ const char *_f, unsigned _l);
+#define rpmGetMachine(_arch, _os) \
+ XrpmGetMachine(_arch, _os, __FILE__, __LINE__)
/** \ingroup rpmrc
* Destroy rpmrc arch/os compatibility tables.
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 086bb962d..565062dce 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -55,44 +55,44 @@ static struct _os_canon {
{ NULL, 0 }
};
-static const char *macrofiles = MACROFILES;
+const char *macrofiles = MACROFILES;
#ifndef DYING
-const char *rpmGetVar(int var)
-{
- return NULL;
-}
-void rpmGetArchInfo(const char ** name, int * num)
+void XrpmGetArchInfo(const char ** name, int * num, const char *_f, unsigned _l)
{
-fprintf(stderr, "*** rpmGetArchInfo(%p,%p)\n", name, num);
+fprintf(stderr, "*** rpmGetArchInfo(%p,%p) %s:%u\n", name, num, _f, _l);
if (name)
*name = rpmExpand("%{_target_cpu}", NULL);
}
-void rpmGetOsInfo(const char ** name, int * num)
+void XrpmGetOsInfo(const char ** name, int * num, const char *_f, unsigned _l)
{
-fprintf(stderr, "*** rpmGetOsInfo(%p,%p)\n", name, num);
+fprintf(stderr, "*** rpmGetOsInfo(%p,%p) %s:%u\n", name, num, _f, _l);
if (name)
*name = rpmExpand("%{_target_os}", NULL);
}
-void rpmGetMachine(const char **arch, const char **os)
+void XrpmGetMachine(const char **arch, const char **os, const char *_f, unsigned _l)
{
+fprintf(stderr, "*** rpmGetMachine(%p,%p) %s:%u\n", arch, os, _f, _l);
}
-void rpmSetMachine(const char * arch, const char * os)
+void XrpmSetMachine(const char * arch, const char * os, const char *_f, unsigned _l)
{
+fprintf(stderr, "*** rpmSetMachine(%p,%p) %s:%u\n", arch, os, _f, _l);
}
#endif
-int rpmMachineScore(int type, const char * name)
+int XrpmMachineScore(int type, const char * name, const char * _f, unsigned _l)
{
+fprintf(stderr, "*** rpmMachineScore(%d,\"%s\") %s:%u\n", type, name, _f, _l);
return 0;
}
void rpmFreeRpmrc(void)
{
+fprintf(stderr, "*** rpmFreeRpmrc()\n");
}
static void defaultMachine(/*@out@*/ char ** arch, /*@out@*/ char ** os)
@@ -218,7 +218,6 @@ fprintf(stderr, "*** _target: \"%s\"\n", *ct);
int rpmReadConfigFiles(const char * mfiles, const char * target)
{
-fprintf(stderr, "*** rpmReadConfigFiles(%s,%s) %s\n", mfiles, target, macrofiles);
if (mfiles == NULL)
mfiles = macrofiles;
@@ -227,11 +226,14 @@ fprintf(stderr, "*** rpmReadConfigFiles(%s,%s) %s\n", mfiles, target, macrofiles
if (mfiles) {
mfiles = rpmExpand(mfiles, NULL);
+fprintf(stderr, "*** rpmInitMacros(NULL,\"%s\")\n", mfiles);
rpmInitMacros(NULL, mfiles);
xfree(mfiles);
+#ifdef DYING
/* Reset target macros */
rpmRebuildTargetVars(&target);
+#endif
}
return 0;
@@ -239,5 +241,6 @@ fprintf(stderr, "*** rpmReadConfigFiles(%s,%s) %s\n", mfiles, target, macrofiles
int rpmShowRC(FILE *fp)
{
+fprintf(stderr, "*** rpmShowRC(%p)\n", fp);
return 0;
}
diff --git a/macros.in b/macros.in
index 9b51c5d0c..197c6a503 100644
--- a/macros.in
+++ b/macros.in
@@ -1,4 +1,4 @@
-# $Id: macros.in,v 1.67 2000/08/28 15:25:04 jbj Exp $
+# $Id: macros.in,v 1.68 2000/09/01 21:15:41 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -274,10 +274,13 @@
%_vendor @RPMCANONVENDOR@
%_os @RPMCANONOS@
%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
+
#
-# XXX use the rpmrc instantiated macro for now
-#%optflags -O2
+# Define a generic value for optflags. Normally overridden by per-target macros.
+%optflags -O2
+#
+# Define per-arch and per-os defaults. Normally overridden by per-target macros.
%__arch_install_post %{nil}
%__os_install_post %{___build_post}
@@ -500,7 +503,7 @@ cd %{u2p:%{_builddir}}\
# gotcha is that arguments, if present, should be on the same line as the
# %configure.
#
-# This is the version of %configure used throuugh rpm-3.0.4.
+# This is the version of %configure used through rpm-3.0.4.
#%configure \
# %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \
# CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix}
diff --git a/po/cs.po b/po/cs.po
index deb8f89ae..3845718c6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-08-08 22:37+0100\n"
"Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "chyba: nemohu otevøít %s/packages.rpm\n"
@@ -23,468 +23,473 @@ msgstr "chybné závislosti pøi sestavování:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Nelze otevøít spec soubor %s: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "Nelze otevøít rouru pro tar: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "Nelze èíst spec soubor %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "Nelze pøejmenovat %s: na %s: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "nemohu zjistit stav %s: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Soubor %s není obyèejný soubor\n"
-#: build.c:221
-#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+#: build.c:224
+#, fuzzy, c-format
+msgid "File %s does not appear to be a specfile."
msgstr "Nezdá se, ¾e by %s byl spec soubor.\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Sestavuji cílové platformy: %s\n"
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr "Sestavuji pro cíl %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verze %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright (c) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Tento program lze volnì ¹íøit podle podmínek GNU GPL."
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr "pou¾ití: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <adr>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <adr>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <adr>] [--ignoreos] [--nodeps] [--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <poèítaè>] [--ftpport <port>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <poèítaè>] [--httpport <port>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--justdb] [--noorder] [--relocate stará_cesta=nová]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <cesta>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] soubor1.rpm ... souborN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <adr>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <soubor>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <adr>] [--prefix <adr>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--ftpproxy <poèítaè>] [--ftpport <port>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--noorder] [--relocate stará_cesta=nová_cesta]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <cesta>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " soubor1.rpm ... souborN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr " [--scripts] [--root <adr>] [--rcfile <soubor>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr " [--triggeredby]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr " [--provides] [--triggers] [--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <adr>] [cíle]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr " rpm {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <adr>] [--nodeps] [--nofiles] [--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [cíle]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [cíl]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [cíl]"
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " rpm {--freshen -F} soubor1.rpm ... souborN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <adr>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
" [--justdb] [--notriggers] balíèek1 ... balíèekN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
" rpm {--resign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
" rpm {--addsign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " balíèek1 ... balíèekN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr "pou¾ití:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "vypsat tuto zprávu"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "vypsat pou¾ívanou verzi rpm"
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr " v¹echny re¾imy podporují tyto parametry:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr " --define '<jméno> <tìlo>'"
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr "definování makra <jméno> s obsahem <tìlo>"
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr " --pipe <pøíkaz> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr "vypsat pou¾ívanou verzi rpm"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <pøíkaz> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "odeslat stdout do <pøíkazu>"
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr " --rcfile <soubor> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "pou¾ijte <soubor> místo /etc/rpmrc a $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr "zobrazit finální konfiguraci rpmrc a maker"
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "o nìco upovídanìj¹í reøim"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "velmi upovídaný re¾im (pro ladìní)"
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" instalace, aktualizace a dotazy (s -p) mohou pou¾ívat URL na místìURL"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " jmen souborù stejnì jako následující volby:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <poèítaè> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "název poèítaèe nebo IP adresa ftp proxy"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "èíslo portu serveru ftp (nebo proxy)"
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr " --httpproxy <poèítaè>"
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "název poèítaèe nebo IP adresa http proxy"
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "èíslo portu http serveru (nebo proxy)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "re¾im dotazù"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <adr> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "pou¾ít <adr> jako adresáø pro databázi"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <qfmt>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr "pou¾ít <qfmt> jako hlavièkový formát (implikuje -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <adr> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Volby pro specifikaci balíèku:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "dotázat v¹echny balíèky"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <soubor>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "dotaz na balíèek vlastnící <soubor>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <soubor_balíèku>+ "
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "dotaz na (nenainstalovaný) balíèek <soubor_balíèku>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <balíèek>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "dotazy na balíèky aktivované <balíèkem>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <cap>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "dotaz na balíèky poskytující schopnost <cap>"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr " --whatrequires <cap>"
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr "dotaz na balíèky vy¾adující schopnost <sch>"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Volby pro vybìr informací:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "zobrazit informace o balíèku"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "zobrazit záznamy o zmìnách balíèku"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "zobrazit seznam souborù v balíèku"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "zobrazit stavy souborù (implikuje -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "vypsat pouze soubory s dokumentací (implikuje -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "vypsat pouze konfiguraèní soubory (implikuje -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -492,23 +497,23 @@ msgstr ""
"zobrazit v¹echny ovìøitelné údaje pro ka¾dý soubor (musí se pou¾ít s -l, -c "
"nebo -d)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "uvést schopnosti poskytované balíèkem"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "uvést závislosti balíèku"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "vytisknout [de]instalaèní skripty"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr "zobrazit spou¹tì (triggery) obsa¾ené v balíèku"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
@@ -516,140 +521,140 @@ msgstr ""
"ovìøit instalaci balíèku pou¾itím stejných voleb pro specifikaci balíèku, "
"jako pro -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "nekontrolovat závislosti balíèkù"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "nekontrolovat md5 souèty souborù"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "nekontrolovat atributy souborù"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "uvést pøíznaky, které lze pou¾ít v dotazovacím formátu"
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <balíèek>"
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <balíèek> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "nainstalovat balíèek"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <cesta>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr "pøeskoèit soubory v cestì <cesta>"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <stará_cesta>=<nová_cesta>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "pøemístit soubory ze <staré_cesty> do <nové_cesty>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr "pøemístìní souborù v nepøemístitelném balíèku"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <adr> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "pøemístit soubory do <adr>, jsou-li pøemístitelné"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "neinstalovat dokumentaci"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "zkratka pro --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "bìhem instalace balíèku zobrazit dvojité køí¾ky (dobré s -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"nainstalovat v¹echny soubory i konfigurace, které by se jinak mohly vynechat"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "nekontrolovat architekturu balíèku"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "nekontrolovat volné místo na disku pøed instalací"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "nekontrolovat operaèní systém balíèku"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "nainstalovat dokumentaci"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "upravit databázi, ale neupravovat systém souborovù"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr "pro vyøe¹ení závislostí nemìnit poøadí instalace balíèkù"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "bìhem instalace balíèku zobrazit procenta"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "instalovat, i kdy¾ balíèek pøepí¹e existující soubory"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "pøeinstalovat, i kdy¾ je ji¾ balíèek pøítomen"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr " --upgrade <balíèek>"
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr " -U <balíèek> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "aktualizovat balíèek (stejné volby jako --install, plus)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -657,15 +662,15 @@ msgstr ""
"aktualizovat na starou verzi balíèku (--force to dìlá pøi aktualizacích "
"automaticky)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr " --erase <balíèek>"
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "smazat (deinstalovat) balíèek"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -673,100 +678,100 @@ msgstr ""
"odstranit v¹echny balíèky odpovídající <balíèku> (obvykle se generuje chyba, "
"specifikuje-li <balíèek> více balíèkù)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<etapa> <spec> "
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr " -t<etapa> <tarball> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "sestavit balíèek, kde <etapa> je jedna z:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "pøíprava (rozbalí zdroje a aplikuje záplaty)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "kontrola seznamù (provede zbì¾né kontroly %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompilace (pøíprava a kompilace)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "instalace (pøíprava, kompilace a instalace)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "binární balíèek (pøíprava, kompilace, instalace, zabalení)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "bin/src balíèek (pøíprava, kompilace, instalace, zabalení)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "pøeskoèit pøímo na urèenou etapu (pouze pro c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "po dokonèení odstranit sestavovací strom"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr "po dokonèení odstranit zdrojové kódy"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr "po dokonèení odstranit spec soubor"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr "generovat PGP/GPG podpis"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr " --buildroot <adr> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "pou¾ít <adr> jako koøen pro sestavení"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr " --target=<platforma>+"
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr "sestavit balíèek pro cíl platforma1...platformaN."
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "nespou¹tìt ¾ádné etapy"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr " --timecheck <sec> "
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "nastavit èasovou kontrolu na <sec> sekund (0 ji deaktivuje)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <zdroj_balíèek> "
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -774,63 +779,63 @@ msgstr ""
"instalovat zdrojový balíèek, sestavit binární balíèek, odstranit spec "
"soubor, zdrojové kódy, záplaty a ikony."
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr " --recompile <zdroj_balíèek> "
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "jako --rebuild, ale nesestavovat balíèky"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr " --resign <balíèek>+ "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "podepsat balíèek (zahodit aktuální podpis)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr " --addsign <balíèek>+ "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "pøidat do balíèku podpis"
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr " --checksig <balíèek>+"
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr " --K <balíèek>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "ovìøit podpis v balíèku"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "vynechat pøípadné PGP podpisy"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr "vynechat pøípadné GPG podpisy"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "vynechat pøípadné MD5 souèty"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "zajistit, aby existovala platná databáze"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "znovu vytvoøit databázi z existující databáze"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -838,7 +843,7 @@ msgstr ""
"nastavit oprávnìní k souborùm podle údajù v databázi balíèkù pomocí stejných "
"voleb pro specifikaci balíèku, jako pro -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -846,139 +851,147 @@ msgstr ""
"nastavit vlastníka a skupinu vlastnící soubor podle údajù v databázi balíèkù "
"pomocí stejných voleb pro specifikaci balíèku, jako pro -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "specifikovat lze jen jeden hlavní re¾im"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u a --uninstall jsou zastaralé a ji¾ je nelze pou¾ít.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Pou¾ijte volbu -e nebo --erase.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "pøemístìní musejí zaèínat znakem /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "pøemístìní musejí obsahovat ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "pøemístìní musejí mít za znakem = znak /"
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musí zaèínat znakem /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "najednou lze provést jen jeden typ dotazu èi ovìøení"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr "neoèekávaný pøíznak pro dotaz"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr "neoèekávaný formát dotazu"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "neoèekávaný zdroj dotazu"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"vynucena mù¾e být jen instalace, aktualizace, smazání zdrojových kódù a spec "
"souboru"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "soubory mohou být pøemístìny jen pøi instalaci balíèkù"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath je mo¾no pou¾ít jen pøi instalaci nových balíèkù"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix je mo¾no pou¾ít jen pøi instalaci nových balíèkù"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "parametry pro --prefix musejí zaèínat znakem /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "pou¾ít lze jen jeden z parametrù --excludedocs a --includedocs"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mù¾e být pou¾it jen pøi instalaci balíèkù"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mù¾e být pou¾it jen pøi instalaci a odstraòování balíèkù"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -986,7 +999,7 @@ msgstr ""
"--noscripts mù¾e být pou¾it jen pøi instalaci, odstraòování nebo kontrole "
"balíèkù"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
@@ -994,7 +1007,7 @@ msgstr ""
"--notriggers mù¾e být pou¾it jen pøi instalaci, odstraòování nebo kontrole "
"balíèkù"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -1002,13 +1015,13 @@ msgstr ""
"--nodeps mù¾e být pou¾it jen pøi sestavování, rekompilaci, instalaci, "
"odstraòování a kontrole"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test mù¾e být pou¾it jen pøi instalaci, odstraòování a sestavování"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1016,97 +1029,97 @@ msgstr ""
"--root (-r) mù¾e být pou¾it jen pøi instalaci, odstraòování, dotazech nebo "
"znovuvytvoøení databáze"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry pro --root (-r) musejí zaèínat znakem /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage lze pou¾ít jen pøi aktualizacích"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp lze pou¾ít jen pøi kontrole podpisù"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg lze pou¾ít jen pøi kontrole podpisù"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 mù¾e být pou¾it jen pøi kontrole podpisù a ovìøování balíèkù"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr "¾ádné soubory k podepsání\n"
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr "pøístup k souboru %s se nezdaøil\n"
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr "pgp nenalezeno: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr "Vlo¾te heslovou frázi: "
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Chybná heslová fráze\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Heslová fráze je v poøádku.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "©patná %%_signature spec v souboru maker.\n"
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign mù¾e být pou¾it jen pøi sestavování balíèkù"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr "spu¹tìní selhalo\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "neoèekávané parametry pro --querytags "
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "ke kontrole podpisu nezadány ¾ádné balíèky"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "k podepsání nezadány ¾ádné balíèky"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "nezadány ¾ádné balíèky pro odstranìní"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "nezadány ¾ádné balíèky pro instalaci"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "k dotazu na v¹echny balíèky zadány parametry navíc"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "k dotazu nezadány ¾ádné parametry"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr "pro kontrolu v¹ech balíèkù zadány parametry navíc"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány ¾ádné balíèky"
@@ -1128,350 +1141,415 @@ msgstr "chyba pøi pøi ètení hlavièky balíèku\n"
msgid "cannot re-open payload: %s\n"
msgstr "nemohu znovu otevøít payload: %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+#, fuzzy
+msgid "'<name> <body>'"
+msgstr " --define '<jméno> <tìlo>'"
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "vypsat pou¾ívanou verzi rpm"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Pou¾ití: %s {--help}\n"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " %s {--initdb} [--dbpath <adr>]\n"
-#: rpmqv.c:289
-#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#: rpmqv.c:295
+#, fuzzy, c-format
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " %s {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]\n"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-#: rpmqv.c:313
-#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <soubor>]"
+
+#: rpmqv.c:319
+#, fuzzy, c-format
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" %s {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]\n"
-#: rpmqv.c:327
-#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr " [--scripts] [--root <adr>] [--rcfile <soubor>]"
+
+#: rpmqv.c:333
+#, fuzzy, c-format
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" %s {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]\n"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " %s {--setperms} [-afpg] [cíl]\n"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " %s {--setugids} [-afpg] [cíl]\n"
-#: rpmqv.c:336
-#, c-format
+#: rpmqv.c:342
+#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
"<soubor>]\n"
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=platforma1[,platforma2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] [--rmspec] spec_soubor"
-#: rpmqv.c:340
-#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#: rpmqv.c:346
+#, fuzzy, c-format
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " %s {--rmsource} [--rcfile <soubor>] [-v] spec_soubor\n"
-#: rpmqv.c:341
-#, c-format
+#: rpmqv.c:347
+#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--rebuild} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
-#: rpmqv.c:342
-#, c-format
+#: rpmqv.c:348
+#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--recompile} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " %s {--freshen -F} soubor1.rpm ... souborN.rpm\n"
-#: rpmqv.c:347
-#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#: rpmqv.c:353
+#, fuzzy, c-format
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
" %s {--resign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN\n"
-#: rpmqv.c:348
-#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+#: rpmqv.c:354
+#, fuzzy, c-format
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
" %s {--addsign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN"
-#: rpmqv.c:349
-#, c-format
+#: rpmqv.c:355
+#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <soubor>]\n"
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr " V¹echny re¾imy podporují tyto volby:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr " --define '<jméno> <tìlo>'"
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+#, fuzzy
+msgid " --eval '<expr>+' "
msgstr " --eval '<pøíkaz>+' "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "vypsat pou¾ívanou verzi rpm"
+
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr " --pipe <pøíkaz> "
-#: rpmqv.c:400
-msgid " --rcfile <file> "
-msgstr " --rcfile <soubor> "
+#: rpmqv.c:406
+#, fuzzy
+msgid " --macros <file:...> "
+msgstr " --rcfile <soubor> "
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr " --dbpath <adr> "
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr " --root <adr> "
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
" Instalace, aktualizace a dotaz (s -p) mohou u¾ívat adresy ve tvaru URL"
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr " na místì jména souboru stejnì jako následující volby:"
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <poèítaè> "
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr " --httpproxy <poèítaè> "
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr " Volby pro specifikaci balíèku:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr "dotázat/ovìøit v¹echny balíèky"
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr " -f <soubor>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr "dotaz/ovìøení balíèku vlastnícího <soubor>"
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr " -p <soubor_balíèku>+ "
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "dotaz/ovìøení (nenainstalovaného) balíèku <soubor_balíèku>"
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr " --triggeredby <balíèek> "
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr "dotaz/ovìøení balíèku aktivovaného <balíèkem>"
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr " --whatprovides <cap> "
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr "dotaz/ovìøení balíèkù poskytujících schopnost <cap>"
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr " --whatrequires <cap> "
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr "dotaz/ovìøení balíèkù vy¾adujících schopnost <cap>"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr " --queryformat <qfmt> "
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr " Volby pro vybìr informací:"
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr "uvést schopnosti poskytované balíèkem"
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr "uvést schopnosti vy¾adované balíèkem"
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr "vytisknout [de]instalaèní skripty"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr "zobrazit spou¹tì (triggery) obsa¾ené v balíèku"
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr " --install <balíèek>"
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr " -i <balíèek> "
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr " --excludepath <cesta> "
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr "pøeskoèit soubory s úvodní cestou <cesta> "
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr " --prefix <adr> "
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <stará_cesta>=<nová_cesta>"
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr " --upgrade <balíèek>"
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr " -U <balíèek> "
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr " --erase <balíèek>"
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr " -b<etapa> <spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr " -t<etapa> <tarball> "
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr "pouze zdrojový balíèek"
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr " --buildroot <adr> "
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr " --target=<platforma>+ "
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <zdroj_balíèek>"
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr " --recompile <zdroj_balíèek>"
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr " --resign <balíèek>+ "
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr " --addsign <balíèek>+ "
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr " --checksig <balíèek>+"
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr " -K <balíèek>+ "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr "inicializovat databázi (není potøeba, zpìtná kompatibilita)"
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr "znovu vytvoøit databázi z existujících databázových hlavièek"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Pou¾ijte volbu -e nebo --erase.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadána pro operaci, která databázi nepou¾ívá"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr "----notriggers mù¾e být pou¾ito jen pøi instalaci nebo mazání balíèkù"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "ke znovusestavení nezadány ¾ádné balíèky"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "pro sestavení nezadány ¾ádné spec soubory"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "pro sestavení nezadány ¾ádné tar soubory"
@@ -1494,6 +1572,13 @@ msgstr "Spu¹tìní %s selhalo (%s): %s"
msgid "Bad exit status from %s (%s)"
msgstr "Návratový kód chyby ze %s: (%s)"
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr "chyba syntaxe pøi zpracování =="
@@ -1713,15 +1798,23 @@ msgstr "Selhalo vyhledání %s:"
msgid "Processing files: %s-%s-%s\n"
msgstr "Zpracovávám soubory: %s-%s-%s\n"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
-msgstr "RPMERR_INTERNAL: Dosa¾en limit v getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
-msgstr "RPMERR_INTERNAL: Dosa¾en limit v getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr "Nemohu získat jméno poèítaèe: %s\n"
@@ -2945,7 +3038,7 @@ msgstr "otevøení %s selhalo: %s\n"
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:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, 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"
@@ -3009,7 +3102,7 @@ msgstr "záznam balíèku èíslo: %u\n"
msgid "record %d could not be read\n"
msgstr "záznam %d nelze pøeèíst\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "balíèek %s není nainstalován\n"
@@ -3312,104 +3405,104 @@ msgstr "ma¾u adresáø %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "nemohu odstranit adresáø %s: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr "poèítám balíèky pro instalaci\n"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "nalezeno %d balíèkù\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "hledám balíèky pro sta¾ení\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "pøeskakuji %s - rpmGlob selhal(%d)\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Stahuji %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr " ... jako %s\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "pøeskakuji %s - pøenos selhal - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "pøijato %d balíèkù\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu otevøít soubor %s: %s\n"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nemù¾e být nainstalován\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nemohu otevøít databázi balíèkù v %s\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr "balíèek %s není pøemístitelný\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba pøi ètení ze souboru %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n"
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "nalezeno %d zdrojových a %d binárních balíèkù\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "nevyøe¹ené závislosti:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "instaluji binární balíèky\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" urèuje více balíèkù\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevøít %s: %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji %s\n"
@@ -3692,99 +3785,107 @@ msgstr "Neznámá nebo neoèekávaná chyba"
msgid "logging into %s as %s, pw %s\n"
msgstr "pøihla¹ování na %s jako %s, heslo %s\n"
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktivní %d prázdný %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(prázdný)"
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(prázdný)\n"
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr "Makro %%%s má neukonèené tìlo"
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "Makro %%%s má neplatné jméno (%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr "Makro %%%s má neukonèené parametry"
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr "Makro %%%s má prázdné tìlo"
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr "Expanze makra %%%s selhala"
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr "Makro %%%s má neplatné jméno (%%undefine)"
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr "Makro %%%s (%s) nebylo pou¾ito pod úrovní %d"
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "Neznámá volba: %c v %s(%s)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr "Hloubka rekurze(%d) je vìt¹í, ne¾ max(%d)"
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr "Neukonèené %c: %s"
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr "Za %% následuje neparsovatelné makro"
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr "makro %%%.*s nenalezeno, pøeskakuji"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "Cílový buffer pøetekl"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "Soubor %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "Soubor %s je men¹í, ne¾ %d bajtù"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "varování: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
+msgstr "(chyba: 0x%x)"
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "fatální chyba: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "chyba: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "fatální chyba: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "varování: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3831,6 +3932,15 @@ msgstr "nemohu otevøít %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
+#~ msgid " --rcfile <file> "
+#~ msgstr " --rcfile <soubor> "
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#~ msgstr "RPMERR_INTERNAL: Dosa¾en limit v getUname()\n"
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#~ msgstr "RPMERR_INTERNAL: Dosa¾en limit v getGname()\n"
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "interní chyba (chyba v rpm?): "
diff --git a/po/da.po b/po/da.po
index 5e1935ba4..8d57094df 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-03-07 05:17+01:00\n"
"Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
"Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "Kan ikke åbne %s/packages.rpm\n"
@@ -23,1064 +23,1077 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr "Kan ikke åbne spec-fil %s: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
-msgstr ""
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
+msgstr "Kan ikke åbne spec-fil %s: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
-msgstr ""
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
+msgstr "Kan ikke åbne spec-fil %s: %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr ""
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
+msgstr "ugyldig flag '%s' ved %s:%d"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "ugyldig flag '%s' ved %s:%d"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Filen er ikke en regulær fil: %s\n"
-#: build.c:221
-#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+#: build.c:224
+#, fuzzy, c-format
+msgid "File %s does not appear to be a specfile."
msgstr "Filen %s synes ikke at være en spec-fil.\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Ophavsret (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr "Brug: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <kat>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <kat>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <vært>] [--ftpport <port>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <vært>] [--httpport <port>] "
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate gammelsti=nysti]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <sti>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] fil-1.rpm ... fil-N.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <kat>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <fil>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <kat>] [--prefix <kat>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httpproxy <vært>] [--httpport <port>] "
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate gammelsti=nysti]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <sti>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " fil-1.rpm ... fil-N.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr " [--scripts] [--root <kat>] [--rcfile <fil>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [mål]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--ftpport <port>] [--provides] [--triggers] [--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <kat>] [mål]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr " rpm {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [mål]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [mål]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [mål]"
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " rpm {--freshen -F} fil-1.rpm ... fil-N.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <kat>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] rpakke1 ... pakkeN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " pakke1 ... pakkeN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr "Brug:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "vis denne meddelse"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "vis versionen af rpm som benyttes"
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr " Alle tilstande understøtter følgende argumenter:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr " --define '<name> <body>'"
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr "definér makro <name> med værdi <body>"
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr " --eval '<name>+' "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <kmd> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr " --rcfile <fil> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <vært> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr " --httpproxy <vært> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <kat> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "forespørg alle pakker"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "installér pakke"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <katalog> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "installér ikke dokumentation"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr " --erase <pakke>"
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "slet (afinstallér) pakke"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompilér (forbered og kompilér)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "installér (forbered, kompilér og installér)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr " --timecheck <sek> "
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr " --resign <pakke>+ "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr " --addsign <pakke>+ "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "tilføj signatur til pakke"
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr " --checksig <pakke>+"
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr " -K <pakke>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "verificér pakke signatur"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage må kun bruges under opgraderinger"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp må kun bruges under signaturkontrollering"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg må kun bruges under signaturkontrollering"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr "pgp ikke fundet: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1102,348 +1115,411 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+#, fuzzy
+msgid "'<name> <body>'"
+msgstr " --define '<name> <body>'"
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Brug: %s {--help}\n"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " %s {--initdb} [--dbpath <katalog>]\n"
-#: rpmqv.c:289
-#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#: rpmqv.c:295
+#, fuzzy, c-format
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " %s {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]\n"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-#: rpmqv.c:313
-#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <fil>]"
+
+#: rpmqv.c:319
+#, fuzzy, c-format
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" %s {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]\n"
-#: rpmqv.c:327
-#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr " [--scripts] [--root <kat>] [--rcfile <fil>]"
+
+#: rpmqv.c:333
+#, fuzzy, c-format
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" %s {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]\n"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " %s {--setperms} [-afpg] [mål]\n"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " %s {--setugids} [-afpg] [mål]\n"
-#: rpmqv.c:336
-#, c-format
+#: rpmqv.c:342
+#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
"<fil>]\n"
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=platform1[,platform2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] [--rmspec] spec-fil"
-#: rpmqv.c:340
-#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#: rpmqv.c:346
+#, fuzzy, c-format
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " %s {--rmsource} [--rcfile <fil>] [-v] 'spec'-fil\n"
-#: rpmqv.c:341
-#, c-format
+#: rpmqv.c:347
+#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--rebuild} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
-#: rpmqv.c:342
-#, c-format
+#: rpmqv.c:348
+#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--recompile} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " %s {--freshen -F} fil1.rpm ... filN.rpm\n"
-#: rpmqv.c:347
-#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#: rpmqv.c:353
+#, fuzzy, c-format
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " %s {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN\n"
-#: rpmqv.c:348
-#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
-msgstr ""
+#: rpmqv.c:354
+#, fuzzy, c-format
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgstr " rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
-#: rpmqv.c:349
-#, c-format
+#: rpmqv.c:355
+#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr " --define '<name> <body>'"
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+#, fuzzy
+msgid " --eval '<expr>+' "
msgstr " --eval '<name>+' "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "vis versionen af rpm som benyttes"
+
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr " --pipe <kmd> "
-#: rpmqv.c:400
-msgid " --rcfile <file> "
-msgstr " --rcfile <fil> "
+#: rpmqv.c:406
+#, fuzzy
+msgid " --macros <file:...> "
+msgstr " --rcfile <fil> "
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr " --dbpath <katalog> "
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr " --root <katalog> "
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " --eval '<name>+' "
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1466,6 +1542,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1685,15 +1768,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2909,7 +3000,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2973,7 +3064,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3250,104 +3341,104 @@ msgstr "fjener kataloget %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "fundet %d pakke(r)\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "leder efter pakker til at hente\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "modtager %d pakker\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan ikke åbne fil %s: %s\n"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Kan ikke åbne %s/packages.rpm\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "installerer binære pakker\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke åbne %s: %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3627,99 +3718,106 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktiv %d tom %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(tom)"
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(tom)\n"
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "Makro %%%s har ugyldig navn (%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "advarsel: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
+msgstr ""
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "fatal fejl: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "fejl: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "fatal fejl: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "advarsel: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3766,6 +3864,9 @@ msgstr ""
msgid "failed to create %s: %s\n"
msgstr ""
+#~ msgid " --rcfile <file> "
+#~ msgstr " --rcfile <fil> "
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "intern fejl (rpm fejl?): "
@@ -3778,9 +3879,6 @@ msgstr ""
#~ msgid "missing architecture for %s at %s:%d"
#~ msgstr "manglende arkitektur for %s ved %s:%d"
-#~ msgid "bad option '%s' at %s:%d"
-#~ msgstr "ugyldig flag '%s' ved %s:%d"
-
#~ msgid "Unknown system: %s\n"
#~ msgstr "Ukendt system: %s\n"
diff --git a/po/de.po b/po/de.po
index dfa75d300..7bc82aba5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
@@ -62,501 +62,507 @@ msgid "Unable to open spec file %s: %s\n"
msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
# , c-format
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, fuzzy, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr "Öffnen von %s fehlgeschlagen\n"
# , c-format
#. Give up
-#: build.c:147
+#: build.c:145
#, fuzzy, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr "Lesen von %s fehlgeschlagen: %s."
# , c-format
-#: build.c:174
+#: build.c:172
#, fuzzy, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr "Lesen von %s fehlgeschlagen: %s."
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
-msgstr ""
+# , c-format
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "Öffnen von %s fehlgeschlagen: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
+msgstr "%s scheint kein RPM-Paket zu sein\n"
-#: build.c:221
+#: build.c:224
#, fuzzy, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr "%s scheint kein RPM-Paket zu sein\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
# , c-format
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Version %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright © 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Dies darf unter den Bedingungen der »GNU GPL« frei verteilt werden"
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "Benutzung: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <VERZ>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <VERZ>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <VERZ>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <HOST>] [--ftpport <PORT>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--ftpproxy <HOST>] [--ftpport <PORT>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate <ALTPFAD>=<NEUPFAD>]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
#, fuzzy
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] DATEI1.rpm ... DATEIn.rpm"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
#, fuzzy
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--badreloc] DATEI1.rpm ... DATEIn.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <VERZ>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <dir>] [--prefix <VERZ>]"
-#: rpm.c:220
+#: rpm.c:222
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--ftpproxy <HOST>] [--ftpport <PORT>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate <ALTPFAD>=<NEUPFAD>]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
#, fuzzy
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr " [--nomd5] [ZIELE]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
#, fuzzy
msgid " file1.rpm ... fileN.rpm"
msgstr " [--badreloc] DATEI1.rpm ... DATEIn.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr " [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [ZIELE]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--dbpath <VERZ>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
#, fuzzy
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--nomd5] [ZIELE]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr " rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <VERZ>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [ZIELE]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [ZIEL]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [ZIEL]"
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " [--badreloc] DATEI1.rpm ... DATEIn.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <VERZ>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] PAKET1 ... PAKETn"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
-#: rpm.c:244
+#: rpm.c:246
#, fuzzy
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " PAKET1 ... PAKETn"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "Benutzung:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "Gibt diesen Text aus"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " alle Modi unterstützen folgende Argumente:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpm.c:293
+#: rpm.c:295
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "<DATEI> anstelle von /etc/rpmrc und $HOME/.rpmrc benutzen"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "Ausgabe etwas ausführlicher gestalten"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "extrem ausführliche Ausgabe (um Programm-Fehler zu finden)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" Installieren, Aktualisieren und Anfragen (mit -p) erlauben es, ftp-URLs"
-#: rpm.c:306
+#: rpm.c:308
#, fuzzy
msgid " of file names as well as the following options:"
msgstr ""
" anstelle von Dateinamen zu benutzen. Außerdem die folgenden Optionen:\n"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "Hostname oder IP des ftp-Proxys"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "Portnummer des ftp-Servers (oder -Proxys)"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
#, fuzzy
msgid "hostname or IP of http proxy"
msgstr "Hostname oder IP des ftp-Proxys"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
#, fuzzy
msgid "port number of http server (or proxy)"
msgstr "Portnummer des ftp-Servers (oder -Proxys)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "Anfrage-Modus"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "<VERZ> als Datenbankverzeichnis benutzen"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "S als Kopfzeilen-Format benutzen (impliziert -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Optionen der Paketauswahl:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "Anfrage an alle Pakete"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "Anfrage nach (nicht installiertem) Paket <PAKET-DATEI>"
-#: rpm.c:332
+#: rpm.c:334
#, fuzzy
msgid " --triggeredby <pkg>"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpm.c:333
+#: rpm.c:335
#, fuzzy
msgid "query packages triggered by <pkg>"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpm.c:334
+#: rpm.c:336
#, fuzzy
msgid " --whatprovides <cap>"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpm.c:335
+#: rpm.c:337
#, fuzzy
msgid "query packages which provide <cap> capability"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
-#: rpm.c:336
+#: rpm.c:338
#, fuzzy
msgid " --whatrequires <cap>"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpm.c:337
+#: rpm.c:339
#, fuzzy
msgid "query packages which require <cap> capability"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Optionen der Informationsauswahl:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "Paketinformationen anzeigen"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "Changelog des Pakets anzeigen"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "Dateiliste des Pakets anzeigen"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "Status der Dateien anzeigen (impliziert -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "Nur Dokumentationsdateien auflisten (impliziert -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -564,172 +570,172 @@ msgstr ""
"Alle überprüfbaren Infos zu jeder Datei anzeigen (mit -l, -c oder -d "
"benutzen!)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "Fähigkeiten des Pakets auflisten"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "Paket-Abhängigkeiten ausgeben"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "Die diversen (De-)Installations-Skripte ausgeben"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
"Ein Paket mit denselben Paketspezifikations-Optionen wie bei -q überprüfen"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "Dateiabhängigkeiten nicht überprüfen"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "md5-Prüfsumme der Datei nicht überprüfen"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "Dateiattribute nicht überprüfen"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "Tags auflisten, die im Anfrageformat benutzt werden können"
-#: rpm.c:379
+#: rpm.c:381
#, fuzzy
msgid " --install <packagefile>"
msgstr "Paket installieren"
-#: rpm.c:380
+#: rpm.c:382
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "Paket installieren"
-#: rpm.c:382
+#: rpm.c:384
#, fuzzy
msgid " --excludepath <path>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "Paket %s ist nicht installiert\n"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "Dokumentation nicht installieren"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "Abkürzung für --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"alle Dateien installieren, auch die config-Dateien, die sonst übergangen "
"würden"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "Paket-Architektur nicht überprüfen"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "Paket-Betriebssystem nicht überprüfen"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "Dokumentation installieren"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "Keine Installations-Skripte ausführen"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "Prozentangabe bei der Paketinstallation ausgeben"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "Paket aktualisieren (dieselben Optionen wie --install, außerdem)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -737,15 +743,15 @@ msgstr ""
"Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
"Aktualisierungen automatisch)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "Paket löschen (deinstallieren)"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -753,111 +759,111 @@ msgstr ""
"Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird "
"ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "Keine paketspezifischen Skripte ausführen"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:458
+#: rpm.c:460
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "Paket erstellen, <STUFE> ist einer der Buchstaben:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden"
# , c-format
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "kontrollieren (oberflächliche Überprüfung der %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompilieren (präparieren und kompilieren)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "installieren (präparieren, kompilieren, installieren)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
"Binärpaket erstellen (präparieren, kompilieren, installieren und paketieren)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
"Binär- und Quellpaket erstellen (präparieren, kompilieren, installieren und "
"Paketieren"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "Direkt zur angegeben Stufe springen (nur für c und i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "Erstellungsdateibaum nach Beendigung löschen"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr "Quellen und spec-Dateien nach Beendigung löschen"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "Quellen und spec-Dateien nach Beendigung löschen"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
#, fuzzy
msgid "generate PGP/GPG signature"
msgstr "PGP-Signatur generieren"
-#: rpm.c:482
+#: rpm.c:484
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "Keine Stufen ausführen"
-#: rpm.c:488
+#: rpm.c:490
#, fuzzy
msgid " --timecheck <secs> "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:489
+#: rpm.c:491
#, fuzzy
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "Die Zeitüberprüfung auf S Sekunden setzen (mit 0 ausschalten)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -865,69 +871,69 @@ msgstr ""
"Quellpaket installieren, Binarypaket erstellen und spec-Datei, Quellen, "
"Patch-Dateien und Icons löschen"
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "wie --rebuild aber kein Paket erstellen"
-#: rpm.c:497
+#: rpm.c:499
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
-#: rpm.c:499
+#: rpm.c:501
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "Signatur einem Paket hinzufügen"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "Paketsignatur überprüfen"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "alle PGP-Signaturen überspringen"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
#, fuzzy
msgid "skip any GPG signatures"
msgstr "alle PGP-Signaturen überspringen"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "alle MD5-Signaturen überspringen"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "Sicherstellen, daß eine gültige Datenbank vorhanden ist"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "Datenbank aus der vorhandenen neu erstellen"
# Was ist gemeint?
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -936,7 +942,7 @@ msgstr ""
"Paketspezifikationsoptionen wie bei -q benutzt würden"
# Was ist gemeint?
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -944,147 +950,155 @@ msgstr ""
"Datei-Eigentümer und -Gruppe gemäß deren in der Paketdatenbank setzen, wie "
"wenn dieselben Paketspezifikationsoptionen wie bei -q benutzt würden"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "Es darf nur ein Hauptmodus angegeben werden"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u und --uninstall sind veraltet und funktionieren nicht mehr.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Benutzen Sie stattdessen -e oder --erase\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "Verschiebungen müssen mit einem »/« beginnen"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "Verschiebungen müssen ein »=« beinhalten"
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "bei Verschiebungen muss ein »/« dem »=« folgen"
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "Verschiebungen müssen mit einem »/« beginnen"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
"Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
"werden"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "Dateien können nur während der Paketinstallation verschoben werden"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "Argumente zu --prefix müssen mit einem / beginnen"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -1092,7 +1106,7 @@ msgstr ""
"--noscripts darf nur während der Paketinstallation, -deinstallation und "
"-überprüfung angegeben werden"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
@@ -1100,7 +1114,7 @@ msgstr ""
"--notriggers darf nur während der Paketinstallation, -deinstallation und "
"-überprüfung angegeben werden"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1109,7 +1123,7 @@ msgstr ""
"--nodeps darf nur während der Paketinstallation, -deinstallation und "
"-überprüfung angegeben werden"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1117,7 +1131,7 @@ msgstr ""
"--test darf nur während der Paketinstallation, -deinstallation und "
"-erstellung angegeben werden"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1125,103 +1139,103 @@ msgstr ""
"--root (-r) darf nur während der Paketinstallation, -deinstallation, "
"-anfrage und Datenbankneuerstellungen angegeben werden"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage darf nur während Aktualisierungen benutzt werden"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"--nopgp darf nur während der Signatur- und Paketüberprüfung angegeben werden"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
#, fuzzy
msgid "pgp not found: "
msgstr "Datei auf dem Server nicht gefunden"
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Das Passwort ist richtig.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign darf nur während der Paketerstellung benutzt werden"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "Es wurden keine Pakete für die Signaturüberprüfung angegeben"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "Es wurden keine Pakete für die Signatur angeben"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
@@ -1244,385 +1258,447 @@ msgstr "Fehler beim Suchen nach Paket %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "Die benutzte RPM-Version anzeigen"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Benutzung: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " rpm {--initdb} [--dbpath <VERZ>]"
-#: rpmqv.c:289
+#: rpmqv.c:295
#, fuzzy, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr " [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr " rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, fuzzy, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " rpm {--setperms} [-afpg] [ZIEL]"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, fuzzy, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " rpm {--setugids} [-afpg] [ZIEL]"
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
"<DATEI>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
#, fuzzy
msgid " [--target=platform1[,platform2...]]"
msgstr " [ZIELE]"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--buildarch <ARCH>] [--rmsource] SPEC-DATEI"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " rpm {--rmsource} [--rcfile <DATAEI>] [-v] SPEC-DATEI"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--rebuild} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--recompile} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " [--badreloc] DATEI1.rpm ... DATEIn.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " rpm {--resign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " alle Modi unterstützen folgende Argumente:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "Die benutzte RPM-Version anzeigen"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
" Installieren, Aktualisieren und Anfragen (mit -p) erlauben es, ftp-URLs"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr ""
" anstelle von Dateinamen zu benutzen. Außerdem die folgenden Optionen:\n"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Optionen der Paketauswahl:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "Anfrage an alle Pakete"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "Anfrage nach (nicht installiertem) Paket <PAKET-DATEI>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Optionen der Informationsauswahl:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "Fähigkeiten des Pakets auflisten"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "Fähigkeiten des Pakets auflisten"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "Die diversen (De-)Installations-Skripte ausgeben"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr "Paket installieren"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "Keine Installations-Skripte ausführen"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr "Paket installieren"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr "Paket installieren"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "Paket hat keinen Namen"
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<STUFE> <SPEC> "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Benutzen Sie stattdessen -e oder --erase\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath wurde für eine Operation angeben, die keine Datenbank benutzt"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
@@ -1630,15 +1706,15 @@ msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
@@ -1664,6 +1740,13 @@ msgstr "öffnen von %s fehlgeschlagen: %s\n"
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
#, fuzzy
msgid "syntax error while parsing =="
@@ -1899,15 +1982,23 @@ msgstr "anlegen von %s fehlgeschlagen\n"
msgid "Processing files: %s-%s-%s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -3195,7 +3286,7 @@ msgstr "öffnen von %s fehlgeschlagen: %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s scheint kein RPM-Paket zu sein\n"
@@ -3262,7 +3353,7 @@ msgstr "ungültige Paket-Nummer: %s\n"
msgid "record %d could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
@@ -3547,109 +3638,109 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
#, fuzzy
msgid "counting packages to install\n"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "Anfrage an alle Pakete"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, fuzzy
msgid "looking for packages to download\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
# , c-format
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Hole %s heraus\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Fehler: %s kann nicht installiert werden\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
# oder besser: "... verletzen" ?
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
@@ -3951,102 +4042,110 @@ msgstr "FTP Unbekannter oder nicht erwarteter Fehler"
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
#, fuzzy
msgid "Macro %%%.*s not found, skipping"
msgstr "Paket %s in %s nicht gefunden"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
# , c-format
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, fuzzy, c-format
msgid "File %s: %s"
msgstr "Öffnen von %s fehlgeschlagen: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "Warnung: "
-
-#: rpmio/rpmlog.c:92
-msgid "error: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
msgstr "Fehler: "
-#: rpmio/rpmlog.c:103
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
msgid "fatal error: "
msgstr "Fataler Fehler: "
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
+msgid "error: "
+msgstr "Fehler: "
+
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "Warnung: "
+
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -4095,6 +4194,10 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
msgid "failed to create %s: %s\n"
msgstr "anlegen von %s fehlgeschlagen\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " -b<STUFE> <SPEC> "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "fehlendes zweites ':' bei %s:%d"
diff --git a/po/es.po b/po/es.po
index f12668c63..44fa0fd1f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/fi.po b/po/fi.po
index ca0452831..eda11125b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -9,7 +9,7 @@ msgstr ""
"Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
"--keyword=N_\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
@@ -24,502 +24,507 @@ msgstr "puuttuvat riippuvuudet:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "En voi avata %s luettavaksi: %s."
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, fuzzy, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr "%s:n avaus epäonnistui\n"
#. Give up
-#: build.c:147
+#: build.c:145
#, fuzzy, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr "En voi lukea %s: %s."
-#: build.c:174
+#: build.c:172
#, fuzzy, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr "En voi lukea %s: %s."
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
-msgstr ""
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "en voinut avata %s: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
+msgstr "%s ei vaikuta RPM-paketilta\n"
-#: build.c:221
+#: build.c:224
#, fuzzy, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr "%s ei vaikuta RPM-paketilta\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versio %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "käyttö: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <hakem>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <hakem>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
"<hakem>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <hakem>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <kone>] [--ftpport <portti>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--ftpproxy <kone>] [--ftpport <portti>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate vanhapolku=uusipolku]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
#, fuzzy
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr " [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
#, fuzzy
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <hakem>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <hakem>] [--prefix "
"<hakem>] "
-#: rpm.c:220
+#: rpm.c:222
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--ftpproxy <kone>] [--ftpport <portti>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate vanhapolku=uusipolku]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
#, fuzzy
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr " [--nomd5] [kohteet]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
#, fuzzy
msgid " file1.rpm ... fileN.rpm"
msgstr " [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [kohteet]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--dbpath <hakem>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
#, fuzzy
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--nomd5] [kohteet]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <hakem>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [kohteet]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [kohde]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [kohde]"
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <hakem>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] paketti1 ... pakettiN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
" rpm {--resign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
" rpm {--addsign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
-#: rpm.c:244
+#: rpm.c:246
#, fuzzy
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " paketti1 ... pakettiN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "käyttö:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "tulosta tämä viesti"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " kaikki moodit tukevat seuraavia parametrejä"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpm.c:293
+#: rpm.c:295
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "lähetä vakiotuloste <komento>:lle"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "käytä <tiedosto> eikä /etc/rpmrc tai $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "tulosta enemmän viestejä"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "tulosta mahdollisimman paljon viestejä (vianetsintään)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa) ftp URL:ja "
"voidaan käyttää"
-#: rpm.c:306
+#: rpm.c:308
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " tiedostoniminä, kuten myös seuraavia parametrejä:\n"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "koneen nimi tai IP tai ftp-proxy"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "ftp-palvelijan (tai proxyn) porttinumero"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
#, fuzzy
msgid "hostname or IP of http proxy"
msgstr "koneen nimi tai IP tai ftp-proxy"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
#, fuzzy
msgid "port number of http server (or proxy)"
msgstr "ftp-palvelijan (tai proxyn) porttinumero"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "kyselymoodi"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "kaytä <hakem> tietokannan hakemistona"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "käytä s headerin formaatina (josta seuraa -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Paketin määrittelyparametrit:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "kysele kaikki paketit"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "kysele(asentamatonta) pakettia <pakettitiedosto>"
-#: rpm.c:332
+#: rpm.c:334
#, fuzzy
msgid " --triggeredby <pkg>"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpm.c:333
+#: rpm.c:335
#, fuzzy
msgid "query packages triggered by <pkg>"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpm.c:334
+#: rpm.c:336
#, fuzzy
msgid " --whatprovides <cap>"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpm.c:335
+#: rpm.c:337
#, fuzzy
msgid "query packages which provide <cap> capability"
msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
-#: rpm.c:336
+#: rpm.c:338
#, fuzzy
msgid " --whatrequires <cap>"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpm.c:337
+#: rpm.c:339
#, fuzzy
msgid "query packages which require <cap> capability"
msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Tietojen valintaparametrit:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "näytä paketin tiedot"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "näytä paketin muutosloki"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "näytä paketin tiedostolistaus"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "näytä tiedostojen tilat (josta seuraa -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "listaa vain dokumettitiedostot (josta seuraa -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -527,23 +532,23 @@ msgstr ""
"näytä kaikki varmistettavissa oleva tieto kustakin tiedostosta (pitää "
"käyttää -l, -c, tai -d kanssa)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "luettele paketin tarjoamat ominaisuudet"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "listaa paketin riippuvuudet"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "tulosta erinäiset asennus/poisto-skriptit"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
@@ -551,146 +556,146 @@ msgstr ""
"tarkista paketin asennus käyttäen samoja paketin määrittelyparametrejä kuin "
"-q "
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "älä tarkista tiedostojen md5-tarkistussummia"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "älä tarkista tiedostojen ominaisuuksia"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "luettele nimiöt, joita voidaan käyttää kyselyn formaatissa"
-#: rpm.c:379
+#: rpm.c:381
#, fuzzy
msgid " --install <packagefile>"
msgstr "asenna paketti"
-#: rpm.c:380
+#: rpm.c:382
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "asenna paketti"
-#: rpm.c:382
+#: rpm.c:384
#, fuzzy
msgid " --excludepath <path>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "paketti %s ei ole asennettu\n"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "älä asenna dokumentointia"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "lyhenne parametreille --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "älä tarkista paketin arkkitehtuuria"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "älä tarkista paketin käyttöjärjestelmää"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "asenna dokumentaatio"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "älä suorita asennusskriptejä"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "tulosta asennuksen eteneminen prosentteina"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "asenna uudelleen, jos paketti on jo asennettu"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "älä asenna, mutta kerro onnistuisiko se"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "päivitä paketti (samat parametrit kuin --install, plus)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -698,15 +703,15 @@ msgstr ""
"päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
"automaattisesti)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "poista paketti"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -714,107 +719,107 @@ msgstr ""
"poista kaikki paketit, joiden nimeä vastaa <paketti> (tavallisesti, jos "
"<paketti> määrittää useita paketteja, tulee virhe)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "älä aja mitään pakettikohtaisia skriptejä"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:458
+#: rpm.c:460
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "tee paketti, jossa <vaihe> on jokin:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "valmistele (pura lähdekoodi ja tee korjaukset)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "listatarkistus (tee joitakin tarkistuksia %tiedostoihin)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "käännä (valmistele ja käännä)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "asenna (valmistele, käännä ja asenna)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "binääripaketti (valmistele, käännä, asenna, paketoi)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "bin/src-paketti (valmistele, käännä, asenna, paketoi)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "siirry suoraan määriteltyyn vaiheeseen (vain c ja i yhteydessä)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "poista käännöspuu, kun valmis"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
#, fuzzy
msgid "generate PGP/GPG signature"
msgstr "generoi PGP-allekirjoitus"
-#: rpm.c:482
+#: rpm.c:484
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "käytä <hakem> käännöspuun juurena"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "älä suorita mitään vaiheita"
-#: rpm.c:488
+#: rpm.c:490
#, fuzzy
msgid " --timecheck <secs> "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:489
+#: rpm.c:491
#, fuzzy
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "aseta aikatarkistus S sekunniksi (0 ohittaa)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -822,68 +827,68 @@ msgstr ""
"asenna lähdekoodipaketti, käännä binääripaketti ja poista "
"määrittelytiedosto, lähdekoodi, korjaukset ja kuvakkeet"
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "kuten --rebuild, mutta ei käännä paketteja"
-#: rpm.c:497
+#: rpm.c:499
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
-#: rpm.c:499
+#: rpm.c:501
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "lisää allekirjoitus pakettiin"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "tarkista paketin allekirjoitus"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "ohita PGP-allekirjoitukset"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
#, fuzzy
msgid "skip any GPG signatures"
msgstr "ohita PGP-allekirjoitukset"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "ohita MD5-allekirjoitukset"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "tarkista, että kunnollinen tietokanta löytyy"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -891,7 +896,7 @@ msgstr ""
"aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa "
"käyttäen samoja pakettien määrittelyparametrejä kuin -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -899,143 +904,151 @@ msgstr ""
"aseta tiedostojen omistaja ja ryhmä niiksi, jotka ne ovat pakettien "
"tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "vain yksi päämoodi voidaan määritellä"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u ja --uninstall ovat vanhentuneet eivätkä enää toimi.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Käytä sen sijaan -e tai --erase .\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "siirtojen pitää alkaa /-merkillä"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "siirroissa pitää olla =-merkki"
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "siirroissa pitää olla / =-merkin jälkeen"
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "siirtojen pitää alkaa /-merkillä"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "odottamaton kyselyn lähde"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "odottamaton kyselyn lähde"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "odottamaton kyselyn lähde"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "vain asennus tai päivitys voidaan pakottaa"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "vain toinen --prefix tai --relocate voidaan antaa"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix parametrien pitää alkaa /-merkillä"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -1043,7 +1056,7 @@ msgstr ""
"--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpm.c:904
+#: rpm.c:912
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
@@ -1052,7 +1065,7 @@ msgstr ""
"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1061,7 +1074,7 @@ msgstr ""
"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1069,7 +1082,7 @@ msgstr ""
"--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
"käännettäessä"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1077,24 +1090,24 @@ msgstr ""
"--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
"kyseltäessä ja tietokannan uudelleenluonnissa"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametrit --root (-r):lle alettava /-merkillä"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage: voidaan käyttää vain paketteja päivitettäessä"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
@@ -1102,79 +1115,79 @@ msgstr ""
"--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa ja paketteja "
"todennettaessa"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
#, fuzzy
msgid "pgp not found: "
msgstr "Tiedostoa ei löytynyt palvelimelta"
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
#, fuzzy
msgid "exec failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "allekirjoituksen tarkistukselle ei määritelty paketteja"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "allekirjoitukselle ei määritelty paketteja"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "poistolle ei määritelty paketteja"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
@@ -1197,148 +1210,207 @@ msgstr "virhe etsittäessä pakettia %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "tulosta käytetyn rpm:n versio"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "käyttö: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " rpm {--initdb} [--dbpath <hakem>]"
-#: rpmqv.c:289
+#: rpmqv.c:295
#, fuzzy, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
+"<hakem>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, fuzzy, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " rpm {--setperms} [-afpg] [kohde]"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, fuzzy, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " rpm {--setugids} [-afpg] [kohde]"
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
"<tiedosto>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
#, fuzzy
msgid " [--target=platform1[,platform2...]]"
msgstr " [kohteet]"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
" [--buildarch <arkk>] [--rmsource] määrittelytiedosto"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
"lähdekoodiN.rpm"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
"lähdekoodiN.rpm"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
" rpm {--resign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
" rpm {--addsign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " kaikki moodit tukevat seuraavia parametrejä"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "tulosta käytetyn rpm:n versio"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1346,257 +1418,262 @@ msgstr ""
" asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa) ftp URL:ja "
"voidaan käyttää"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " tiedostoniminä, kuten myös seuraavia parametrejä:\n"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Paketin määrittelyparametrit:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "kysele kaikki paketit"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "kysele(asentamatonta) pakettia <pakettitiedosto>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Tietojen valintaparametrit:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "luettele paketin tarjoamat ominaisuudet"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "luettele paketin tarjoamat ominaisuudet"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "tulosta erinäiset asennus/poisto-skriptit"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr "asenna paketti"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "älä suorita asennusskriptejä"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr "asenna paketti"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr "asenna paketti"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "paketilla ei ole nimeä"
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<vaihe> <määrittely> "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Käytä sen sijaan -e tai --erase .\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
@@ -1620,6 +1697,13 @@ msgstr "%s:n avaus ei onnistunut: %s\n"
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
#, fuzzy
msgid "syntax error while parsing =="
@@ -1845,15 +1929,23 @@ msgstr "%s:n luonti epäonnistui\n"
msgid "Processing files: %s-%s-%s\n"
msgstr "en voinut avata %s: %s"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -3111,7 +3203,7 @@ msgstr "%s:n avaus ei onnistunut: %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s ei vaikuta RPM-paketilta\n"
@@ -3176,7 +3268,7 @@ msgstr "virheellinen paketin numero: %s\n"
msgid "record %d could not be read\n"
msgstr "tietuetta %d ei voitu lukea\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -3455,107 +3547,107 @@ msgstr "virhe luotaessa hakemistoa %s: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
#, fuzzy
msgid "counting packages to install\n"
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "kysele kaikki paketit"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, fuzzy
msgid "looking for packages to download\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "virhe: %s ei voida asentaa\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
@@ -3856,101 +3948,109 @@ msgstr "FTP:n tuntematon tai odottamaton virhe"
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
#, fuzzy
msgid "Macro %%%.*s not found, skipping"
msgstr "paketti %s ei ole %s:ssä"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, fuzzy, c-format
msgid "File %s: %s"
msgstr "en voinut avata %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "varoitus: "
-
-#: rpmio/rpmlog.c:92
-msgid "error: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
msgstr "virhe: "
-#: rpmio/rpmlog.c:103
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
msgid "fatal error: "
msgstr "vakava virhe: "
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
+msgid "error: "
+msgstr "virhe: "
+
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "varoitus: "
+
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3997,6 +4097,10 @@ msgstr "en voinut avata %s: %s"
msgid "failed to create %s: %s\n"
msgstr "%s:n luonti epäonnistui\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " -b<vaihe> <määrittely> "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "toinen ':' puuttuu, %s:%d"
diff --git a/po/fr.po b/po/fr.po
index a0f9278a1..4f7b25979 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
msgid ""
-msgstr "POT-Creation-Date: 2000-08-30 22:29-0400\n"
+msgstr "POT-Creation-Date: 2000-09-01 17:07-0400\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -16,678 +16,683 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, fuzzy, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr "impossible d'ouvrir: %s\n"
#. Give up
-#: build.c:147
+#: build.c:145
#, fuzzy, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:174
+#: build.c:172
#, fuzzy, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr "impossible d'ouvrir: %s\n"
-#: build.c:214
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: build.c:216
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "File %s is not a regular file."
msgstr ""
-#: build.c:221
+#: build.c:224
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Peut être redistribué librement selon les termes de la GNU GPL"
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
#, fuzzy
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr " --force - raccourci pour --replacepkgs --replacefiles"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
#, fuzzy
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " qui matchent <pkg>"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " qui matchent <pkg>"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " -a - interroge l'ensemble des packages"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
#, fuzzy
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr " -a - interroge l'ensemble des packages"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
#, fuzzy
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " -l - affiche la liste des packages"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
#, fuzzy
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
" -i - affiche les informations relatives à un package"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " qui matchent <pkg>"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
#, fuzzy
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr " -a - interroge l'ensemble des packages"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
#, fuzzy
msgid " file1.rpm ... fileN.rpm"
msgstr " -l - affiche la liste des packages"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " -q - mode interrogation"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr " -a - interroge l'ensemble des packages"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
#, fuzzy
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " -a - interroge l'ensemble des packages"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
#, fuzzy
msgid " [--nomd5] [targets]"
msgstr " -q - mode interrogation"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " -l - affiche la liste des packages"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
#, fuzzy
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " -a - interroge l'ensemble des packages"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
" - installe le package source, construit le package "
"binaire,"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
#, fuzzy
msgid " package1 ... packageN"
msgstr " qui matchent <pkg>"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
#, fuzzy
msgid "print this message"
msgstr " --help\t\t- affiche ce message"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
#, fuzzy
msgid "print the version of rpm being used"
msgstr " --version\t\t- affiche la version de rpm utilisée"
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr " --version\t\t- affiche la version de rpm utilisée"
-#: rpm.c:293
+#: rpm.c:295
#, fuzzy
msgid " --pipe <cmd> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
#, fuzzy
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme répertoire racine"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Options de spécification de package:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
#, fuzzy
msgid "query package owning <file>"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: rpm.c:330
+#: rpm.c:332
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -i <packagefile>\t- installe le package"
-#: rpm.c:331
+#: rpm.c:333
#, fuzzy
msgid "query (uninstalled) package <packagefile>"
msgstr ""
" -p <packagefile>+ - interroge le package (non installé) <packagefile>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
#, fuzzy
msgid "query packages triggered by <pkg>"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Options de sélection d'information:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
#, fuzzy
msgid "display package information"
msgstr ""
" -i - affiche les informations relatives à un package"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
#, fuzzy
msgid "display package file list"
msgstr " -l - affiche la liste des packages"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
#, fuzzy
msgid "show file states (implies -l)"
msgstr " -s - montre l'état des fichiers (implique -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
#, fuzzy
msgid "list only documentation files (implies -l)"
msgstr ""
" -d - donne uniquement la liste des fichiers de "
"documentation (implique -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
#, fuzzy
msgid "list only configuration files (implies -l)"
msgstr ""
" -c - donne uniquement la liste des fichiers de "
"configuration (implique -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
#, fuzzy
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr "\t\t\t mêmes options de spécification de package qu'avec -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
#, fuzzy
msgid " --install <packagefile>"
msgstr ""
" -p <packagefile>+ - interroge le package (non installé) <packagefile>"
-#: rpm.c:380
+#: rpm.c:382
#, fuzzy
msgid " -i <packagefile> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
#, fuzzy
msgid "short hand for --replacepkgs --replacefiles"
msgstr " --force - raccourci pour --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
#, fuzzy
msgid "print hash marks as package installs (good with -v)"
msgstr ""
" --hash - affiche des '#' pendant l'installation du package "
"(utile avec -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
#, fuzzy
msgid "print percentages as package installs"
msgstr ""
" --percent - affiche des '%' pendant l'installation du package"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
#, fuzzy
msgid "install even if the package replaces installed files"
msgstr ""
" --replacefiles - installe même si le package remplace des fichiers "
"déjà présents"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
#, fuzzy
msgid "reinstall if the package is already present"
msgstr " --replacepkgs - réinstalle si le package est déjà présent"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
#, fuzzy
msgid "don't install, but tell if it would work or not"
msgstr ""
" --test - n'installe pas, mais indique si ca fonctionnerait "
"ou pas"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
#, fuzzy
msgid " -U <packagefile> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
#, fuzzy
msgid "upgrade package (same options as --install, plus)"
msgstr ""
" -U <packagefile>\t- mise à jour du package (mêmes options que --install, "
"plus)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
#, fuzzy
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
@@ -696,131 +701,131 @@ msgstr ""
" --oldpackage - mise à jour par une ancienne version du package "
"(--force"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
#, fuzzy
msgid "build package, where <stage> is one of:"
msgstr " -b<stage> <spec> - construit le package, <stage> peut valoir:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
#, fuzzy
msgid "prep (unpack sources and apply patches)"
msgstr "\t\t\t p - prépare (extrait le source et applique les patches)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, fuzzy, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "\t\t\t l - liste vérif (effectue quelques vérifications sur %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
#, fuzzy
msgid "compile (prep and compile)"
msgstr "\t\t\t c - compile (prépare et compile)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
#, fuzzy
msgid "install (prep, compile, install)"
msgstr "\t\t\t i - installe (prépare, compile, installe)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
#, fuzzy
msgid "binary package (prep, compile, install, package)"
msgstr "\t\t\t b - package binaire (prépare, compile, installe, package)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
#, fuzzy
msgid "bin/src package (prep, compile, install, package)"
msgstr "\t\t\t a - package bin/src (prépare, compile, installe, package)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
#, fuzzy
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
" --short-circuit - passe directement à l'étape spécifiée (seulement "
"pour c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
#, fuzzy
msgid "remove build tree when done"
msgstr " --clean - efface l'arborescence après construction"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr " --clean - efface l'arborescence après construction"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr " --clean - efface l'arborescence après construction"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
#, fuzzy
msgid "generate PGP/GPG signature"
msgstr " --sign - genère une signature PGP"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
#, fuzzy
msgid " --timecheck <secs> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:489
+#: rpm.c:491
#, fuzzy
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
" --time-check <s> - positionne l'intervalle de vérification à S "
"secondes (0 le désactive)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
#, fuzzy
msgid ""
"install source package, build binary package and remove spec file, sources, "
@@ -829,242 +834,250 @@ msgstr ""
" et efface le fichier spec, les sources, les "
"patches, et les icones."
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
#, fuzzy
msgid "skip any GPG signatures"
msgstr " --sign - genère une signature PGP"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "un seul mode majeur peut être spécifié"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
#, fuzzy
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u et --uninstall sont obsolètes et seront bientôt supprimés.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Utilisez de préférence -e ou --erase.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
#, fuzzy
msgid "relocations must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "un seul type de requête/vérification peut être effectué à la fois"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "source de requête inattendue"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "source de requête inattendue"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "source de requête inattendue"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "seules l'installation et la mise à jour peuvent être forcées"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr ""
"--replacefiles ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "un seul mode majeur peut être spécifié"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--clean ne peut être spécifié que lors de la construction d'un package"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
#, fuzzy
msgid "--prefix may only be used when installing new packages"
msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
#, fuzzy
msgid "arguments to --prefix must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
"--percent ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
#, fuzzy
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--percent ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
#, fuzzy
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--percent ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
#, fuzzy
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "un seul mode majeur peut être spécifié"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
#, fuzzy
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--percent ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
#, fuzzy
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"--percent ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"--percent ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
#, fuzzy
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--replacepkgs ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut être spécifié que lors de l'installation d'un package"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test ne peut être spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
#, fuzzy
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
@@ -1073,7 +1086,7 @@ msgstr ""
"--test ne peut être spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:904
+#: rpm.c:912
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
@@ -1082,7 +1095,7 @@ msgstr ""
"--test ne peut être spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1091,7 +1104,7 @@ msgstr ""
"--test ne peut être spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
#, fuzzy
msgid ""
"--test may only be specified during package installation, erasure, and "
@@ -1100,7 +1113,7 @@ msgstr ""
"--test ne peut être spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
#, fuzzy
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
@@ -1109,105 +1122,105 @@ msgstr ""
"--root (-r) ne peut être spécifié que lors de l'installation, de la "
"désinstallation ou de l'interrogation d'un package"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage ne peut être spécifié que lors de mises à jour"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
#, fuzzy
msgid "--nopgp may only be used during signature checking"
msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
#, fuzzy
msgid "pgp not found: "
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "La vérification du mot de passe a échoué\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Mot de passe correct.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
#, fuzzy
msgid "exec failed\n"
msgstr "La construction a échoué.\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "aucun package n'a été spécifié pour la vérification de signature"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
#, fuzzy
msgid "no packages given for signing"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
#, fuzzy
msgid "extra arguments given for query of all packages"
msgstr "aucun argument n'a été fourni pour la requête"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "aucun argument n'a été fourni pour la requête"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "aucun argument n'a été fourni pour la requête"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "aucun argument n'a été fourni pour la vérification"
@@ -1229,373 +1242,434 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr " --version\t\t- affiche la version de rpm utilisée"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr " -a - interroge l'ensemble des packages"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr " --force - raccourci pour --replacepkgs --replacefiles"
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" -i - affiche les informations relatives à un package"
+
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
#, fuzzy
msgid " [--target=platform1[,platform2...]]"
msgstr ""
" -i - affiche les informations relatives à un package"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr " -a - interroge l'ensemble des packages"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " -a - interroge l'ensemble des packages"
-#: rpmqv.c:341
-#, c-format
+#: rpmqv.c:347
+#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
-msgstr ""
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
+msgstr " -l - affiche la liste des packages"
-#: rpmqv.c:342
-#, c-format
+#: rpmqv.c:348
+#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
-msgstr ""
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
+msgstr " -l - affiche la liste des packages"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " -l - affiche la liste des packages"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr " --version\t\t- affiche la version de rpm utilisée"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Options de spécification de package:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -i <packagefile>\t- installe le package"
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -i <packagefile>\t- installe le package"
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
" -p <packagefile>+ - interroge le package (non installé) <packagefile>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Options de sélection d'information:"
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr ""
" -p <packagefile>+ - interroge le package (non installé) <packagefile>"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
" -f <file>+ - interroge le package à qui appartient <file>"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr ""
" -p <packagefile>+ - interroge le package (non installé) <packagefile>"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr ""
" -p <packagefile>+ - interroge le package (non installé) <packagefile>"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -i <packagefile>\t- installe le package"
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --checksig <pkg>+ - vérifie la signature PGP"
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Utilisez de préférence -e ou --erase.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
@@ -1603,15 +1677,15 @@ msgstr ""
"--test ne peut être spécifié que lors de l'installation ou désinstallation "
"d'un package"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "aucun package n'a été spécifié pour la reconstruction"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "aucun package n'a été spécifié pour la construction"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
#, fuzzy
msgid "no tar files given for build"
msgstr "aucun package n'a été spécifié pour la construction"
@@ -1636,6 +1710,13 @@ msgstr "La construction a échoué.\n"
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1856,15 +1937,23 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -3120,7 +3209,7 @@ msgstr "La construction a échoué.\n"
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -3185,7 +3274,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a été spécifié pour l'installation"
@@ -3463,105 +3552,105 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
#, fuzzy
msgid "counting packages to install\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3847,99 +3936,106 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
#, fuzzy
msgid "Macro %%%.*s not found, skipping"
msgstr "aucun package n'a été spécifié pour la désinstallation"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, fuzzy, c-format
msgid "File %s: %s"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
+msgstr ""
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
@@ -3988,6 +4084,10 @@ msgid "failed to create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " -i <packagefile>\t- installe le package"
+
+#, fuzzy
#~ msgid "Unable to open %s for reading: %s."
#~ msgstr "impossible d'ouvrir: %s\n"
@@ -4168,11 +4268,6 @@ msgstr "impossible d'ouvrir: %s\n"
#~ msgstr "--oldpackage ne peut être spécifié que lors de mises à jour"
#, fuzzy
-#~ msgid ""
-#~ " [--provides] [--dump] [--dbpath <dir>] [targets]"
-#~ msgstr " -a - interroge l'ensemble des packages"
-
-#, fuzzy
#~ msgid " --help\t\t- print this message"
#~ msgstr " --help\t\t- affiche ce message"
diff --git a/po/gl.po b/po/gl.po
index f12668c63..44fa0fd1f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/hu.po b/po/hu.po
index f12668c63..44fa0fd1f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/id.po b/po/id.po
index f12668c63..44fa0fd1f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/is.po b/po/is.po
index f697c65e5..0ba90a8c1 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 1.37\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-08-02 13:00+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "get ekki opnað %s/packages.rpm\n"
@@ -23,1065 +23,1078 @@ msgstr "gat ekki útbúið pakkaskilyrði:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Get ekki opnað spec skrána %s: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "Gat ekki opnað pípu í tar: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "Gat ekki lesið spec skrá frá %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "Gat ekki endurnefnt %s sem %s: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "gat ekki búið til %s: %s\n"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Skráin er ekki venjuleg skrá: %s\n"
-#: build.c:221
-#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+#: build.c:224
+#, fuzzy, c-format
+msgid "File %s does not appear to be a specfile."
msgstr "Skráin %s virðist ekki vera specskrá.\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Þýði fyrir markkerfi: %s\n"
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr "Þýði fyrir markkerfi %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM útgáfa %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Höfundarréttur (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Þessu má dreyfa frjálst samkvæmt skilmálum GNU GPL"
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr "Notkun: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <mappa>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <mappa>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <skrá>] [--ignorearch] [--dbpath <mappa>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <mappa>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
" [--ftpproxy <þjónn>] [--ftpport <gátt>] [--justdb]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <þjónn>] [--httpport <gátt>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--justdb] [--noorder] [--relocate slóð=nýslóð]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <slóð>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] skrá1.rpm ... skráN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <mappa>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <skrá>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <mappa>] [--prefix "
"<mappa>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httpproxy <þjónn>] [--httpport <gátt>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <slóð>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " skrá1.rpm ... skráN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr " [--scripts] [--root <mappa>] [--rcfile <skrá>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
" [--triggeredby] [--ftpport] [--ftpproxy <þjónn>]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--ftpport <gátt>] [--provides] [--triggers] [--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <mappa>] [targets]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr " rpm {--verify -V -y} [-afpg] [--root <mappa>] [--rcfile <skrá>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <mappa>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [targets]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [target]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [target]"
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " rpm {--freshen -F} skrá1.rpm ... skráN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <mappa>] [--noscripts] [--rcfile <skrá>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <mappa>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] pakki1 ... pakkiN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <skrá>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " pakki1 ... pakkiN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <skrá>] [--dbpath <mappa>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr "Notkun:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "prenta þessi skilaboð"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "prenta útgáfunúmer rpm sem verið er að nota"
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr " Allir hamir styðja eftirtalin viðföng:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr " --define '<nafn> <gildi>'"
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr "skilgreina fjölva <nafn> með gildinu <gildi>"
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr " --eval '<nafn>+' "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr "prenta útvíkkun fjölva <nafn> á staðalfrálag"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <skipun> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "senda frálag í <skipun>"
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr " --rcfile <skrá> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "nota <skrá> í stað /etc/rpmrc og $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr "sýna endanlega rpmrc og stillingar fjölva"
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "vera aðeins ítarlegri"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "vera hrikalega ítarlegur (fyrir aflúsun)"
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr " Innsetningar, uppfærslur og fyrirspurnir (með -p) leyfa notkun URLa"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " í stað skráarnafna ásamt eftirfarandi rofum:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <þjónn> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "vélarheiti eða IP vistfang ftp sels"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <gátt> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "gátt ftp þjónsins eða selsins"
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr " --httpproxy <þjónn> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "vélarheiti eða IP vistfang vefsels"
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr " --httpport <gátt> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "gátt vefþjónsins eða vefselsins"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "fyrirspurnarhamur"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <mappa> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <qfmt>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <mappa> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "fyrirspurn á alla pakka"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <skrá>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "fyrirspurn á pakkann sem á <skrá>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <pakkaskrá>+ "
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "fyrirspurn á (fjarlægðann) package <pakkaskrá>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <pakki>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <cap>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "fyrirspurn á pakkana sem veita <cap> eiginleika"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr " --whatrequires <cap>"
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr "fyrirspurn á pakkana sem þarfnast <cap> eiginleika"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <pakkaskrá>"
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <pakkaskrá> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "setja inn pakka"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <slóð>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <gömulslóð>=<nýslóð>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <mappa> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr " --checksig <pakki>+"
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr " -K <pakki>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1103,339 +1116,405 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+#, fuzzy
+msgid "'<name> <body>'"
+msgstr " --define '<nafn> <gildi>'"
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "prenta útvíkkun fjölva <nafn> á staðalfrálag"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
-#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
-msgstr ""
+#: rpmqv.c:295
+#, fuzzy, c-format
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgstr " rpm {--rebuilddb} [--rcfile <skrá>] [--dbpath <mappa>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
-#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
+" [--rcfile <skrá>] [--ignorearch] [--dbpath <mappa>]"
-#: rpmqv.c:327
-#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <skrá>]"
-#: rpmqv.c:331
+#: rpmqv.c:319
+#, fuzzy, c-format
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+" rpm {--erase -e} [--root <mappa>] [--noscripts] [--rcfile <skrá>]"
+
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr " [--scripts] [--root <mappa>] [--rcfile <skrá>]"
+
+#: rpmqv.c:333
+#, fuzzy, c-format
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgstr " rpm {--verify -V -y} [-afpg] [--root <mappa>] [--rcfile <skrá>]"
+
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=kerfi1[,kerfi2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] [--rmspec] specskrá"
-#: rpmqv.c:340
-#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
-msgstr ""
+#: rpmqv.c:346
+#, fuzzy, c-format
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgstr " [--rmsource] [--rmspec] specskrá"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
-#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
-msgstr ""
+#: rpmqv.c:353
+#, fuzzy, c-format
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgstr " rpm {--resign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
-#: rpmqv.c:348
-#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
-msgstr ""
+#: rpmqv.c:354
+#, fuzzy, c-format
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgstr " rpm {--addsign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
-#: rpmqv.c:349
-#, c-format
+#: rpmqv.c:355
+#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
+" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <skrá>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
-msgstr ""
+#: rpmqv.c:402
+#, fuzzy
+msgid " --eval '<expr>+' "
+msgstr " --eval '<nafn>+' "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "prenta útvíkkun fjölva <nafn> á staðalfrálag"
+
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+#, fuzzy
+msgid " --macros <file:...> "
+msgstr " --rcfile <skrá> "
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr " -f <skrá>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr " -p <pakkaskrá>+ "
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr " -K <pakki>+ "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1458,6 +1537,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1677,15 +1763,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2901,7 +2995,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2965,7 +3059,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3242,104 +3336,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "get ekki opnað pakka gagnagrunn í\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3619,99 +3713,106 @@ msgstr "Óþekkt eða óvænt villa"
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== virkt %d tómt %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "+Oþekkt viðfang %c í %s(%s)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr "Fjölvi %%%.*s fanmst ekki. Sleppi"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "Skrá %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "Skráin %s er minni en %d bæti"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "aðvörun: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
+msgstr ""
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "banvæn villa: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "villa: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "banvæn villa: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "aðvörun: "
#: rpmio/rpmmalloc.c:13
#, c-format
diff --git a/po/it.po b/po/it.po
index f12668c63..44fa0fd1f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/ja.po b/po/ja.po
index b2b8f4029..2f68933f9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: EUC-JP\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
@@ -29,39 +29,44 @@ msgstr "°Í¸À­¤Î·çÇ¡:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "spec ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "tar ¥Ñ¥¤¥×¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "%s ¤«¤é spec ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "stat %s ¤Ë¼ºÇÔ: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s\n"
-#: build.c:221
+#: build.c:224
#, fuzzy, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï ¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
@@ -83,431 +88,431 @@ msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
# build root [BuildRoot]
# net share [¥Í¥Ã¥È¶¦Í­]
# reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.112 2000/08/31 02:38:59 jbj Exp $
-#: rpm.c:178 rpmqv.c:257
+# $Id: ja.po,v 1.113 2000/09/01 21:15:42 jbj Exp $
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ¥Ð¡¼¥¸¥ç¥ó %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
"Ãøºî¸¢ (C) 1998 - Red Hat Software\n"
"ËÝÌõ¼Ô ¿ÀÅÄ ½¼ <kanda@nn.iij4u.or.jp>\n"
"¸íÌõÅù¤Ï¿ÀÅĤޤÇ"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
#, fuzzy
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "GNU°ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Î²¼¤Ç¼«Í³¤ËÇÛÉۤǤ­¤Þ¤¹"
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "»ÈÍÑË¡: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "»ÈÍÑË¡:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " °Ê²¼¤Î°ú¿ô¤Ï¤¹¤Ù¤Æ¤Î¥â¡¼¥É¤Ç»ÈÍѤǤ­¤Þ¤¹:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "ɸ½à½ÐÎϤò <cmd> ¤Ø¥Ñ¥¤¥×¤·¤Þ¤¹"
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "/etc/rpmrc ¤È $HOME/.rpmrc ¤ÎÂå¤ê¤Ë <file> ¤ò»ÈÍѤ·¤Þ¤¹"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "¤â¤¦¾¯¤·¾ðÊóɽ¼¨¤òÁý¤ä¤·¤Þ¤¹"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "½½Ê¬¤Ë¾ðÊóɽ¼¨¤òÁý¤ä¤·¤Þ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr "¥Õ¥¡¥¤¥ë̾¤È°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ÎÂå¤ê¤Ë ftp URL ¤ò»È¤¨¤ë¤è¤¦(-p ¤òÍѤ¤¤Æ)"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢Ì䤤¹ç¤ï¤»¤·¤Þ¤¹:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "ftp ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "ftp (¤â¤·¤¯¤Ï¥×¥í¥­¥·)¥µ¡¼¥Ð¤Î¥Ý¡¼¥ÈÈÖ¹æ"
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
#, fuzzy
msgid "hostname or IP of http proxy"
msgstr "http ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
#, fuzzy
msgid "port number of http server (or proxy)"
msgstr "http (¤â¤·¤¯¤Ï¥×¥í¥­¥·)¥µ¡¼¥Ð¤Î¥Ý¡¼¥ÈÈÖ¹æ"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤΥǥ£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤òÍѤ¤¤Þ¤¹"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "¥Ø¥Ã¥À¥Õ¥©¡¼¥Þ¥Ã¥È¤È¤·¤Æ <qfmt> ¤ò»ÈÍѤ·¤Þ¤¹ (-i ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Þ¤¹"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " ¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "<file> ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
"(̤¥¤¥ó¥¹¥È¡¼¥ë)¥Ñ¥Ã¥±¡¼¥¸ <packagefile> ¤ò\n"
"Ì䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "<cap> ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
"<cap> ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
"Ì䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " ¾ðÊóÁªÂò¥ª¥×¥·¥ç¥ó:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÊѹ¹ÍúÎò¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹(-l ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
"¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ëʸ½ñ¥Õ¥¡¥¤¥ë¤Î¤ß¤Î¾õÂÖ¤òɽ¼¨¤·\n"
"\t\t\t ¤Þ¤¹(-l ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Î¤ß¤òɽ¼¨¤·¤Þ¤¹(-l ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -515,25 +520,25 @@ msgstr ""
"¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú²Äǽ¤ÊÁ´¾ðÊó¤òɽ¼¨¤·¤Þ¤¹(-l¡¢\n"
"-c¡¢-d ¤Î¤¤¤º¤ì¤«¤È¶¦¤ËÍѤ¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "[¥¢¥ó]¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
"¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Þ\n"
"\t\t\t ¤¹"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
@@ -541,155 +546,155 @@ msgstr ""
"-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
"¥¤¥ó¥¹¥È¡¼¥ë¤Î¾õ¶·¤ò¸¡¾Ú¤·¤Þ¤¹"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "¥Õ¥¡¥¤¥ë¤Î md5 ¥Á¥§¥Ã¥¯¥µ¥à¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "¥Õ¥¡¥¤¥ë°À­¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
"Ì䤤¹ç¤ï¤»¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤ËÍѤ¤¤é¤ìÆÀ¤ë¥¿¥°¤ò\n"
"\t\t\t ɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
#, fuzzy
msgid "skip files in path <path>"
msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"ºÆÇÛÃÖ²Äǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ñ¥¹\n"
"ÀÜƬ¼­¤ò <dir> ¤ËÀßÄꤷ¤Þ¤¹"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤»¤ó"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs ¤È --replacefiles ¤òû½Ì¤·¤¿¤â¤Î"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '#' ¤Çɽ¼¨¤·¤Þ¤¹(-v ¤ò»ÈÍѤ¹¤ë¤ÈÎɤ¤)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr "ÀßÄê¤ò¥¹¥­¥Ã¥×¤·¡¢Á´¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÂоݥ¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë¥Ç¥£¥¹¥¯¤ÎÍÆÎÌ¥Á¥§¥Ã¥¯¤ò¤·¤Þ¤»¤ó"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ÂоÝOS¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
"¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Þ¤¹¤¬¡¢\n"
"¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÊѹ¹¤·¤Þ¤»¤ó"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"°Í¸À­¤òËþ¤¿¤¹¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î\n"
"¥¤¥ó¥¹¥È¡¼¥ë¤òÍ׵ᤷ¤Þ¤»¤ó"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
"¼Â¹Ô¤·¤Þ¤»¤ó"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '%' ¤Çɽ¼¨¤·¤Þ¤¹"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
"¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤¬\n"
"¤¢¤Ã¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "´û¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¹Ô¤¤¤Þ¤¹"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
"¥Ñ¥Ã¥±¡¼¥¸¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹(--install "
"¤È´ö¤Ä¤«¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±Â­¤·¤¿¤â¤Î)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -697,15 +702,15 @@ msgstr ""
"¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹\n"
"(¥¢¥Ã¥×¥°¥ì¡¼¥É»þ¤Î --force ¤Ï¤³¤ì¤ò¼«Æ°Åª¤Ë¹Ô¤¤¤Þ¤¹)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü(¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë)¤·¤Þ¤¹"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -713,103 +718,103 @@ msgstr ""
"<package> ¤È°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸Á´¤Æ¤òºï½ü¤·¤Þ¤¹(°ìÈÌ\n"
"\t\t\t Ū¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤹ¤ë¤È¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤·¤Þ¤¹¡¢<stage> ¤Ï°Ê²¼¤Î¤¦¤Á¤Ò¤È¤Ä¤Ç¤¹:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "prep (¥½¡¼¥¹¤òŸ³«¤·¥Ñ¥Ã¥Á¤òÅö¤Æ¤Þ¤¹)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "¥ê¥¹¥È¸¡ºº (%files ¥»¥¯¥·¥ç¥ó¤ÎÂç¤Þ¤«¤Ê¥Á¥§¥Ã¥¯)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "¥³¥ó¥Ñ¥¤¥ë (prep¡¢compile)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë (prep¡¢compile¡¢install)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "¥Ð¥¤¥Ê¥ê¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "¥Ð¥¤¥Ê¥ê/¥½¡¼¥¹¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "»ØÄꤷ¤¿²áÄø¤Þ¤Ç¥¹¥­¥Ã¥×¤·¤Þ¤¹ (c¡¢i ¤Ç¤Î¤ßÍ­¸ú)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¸åºîÀ®¥Ä¥ê¡¼¤òºï½ü¤·¤Þ¤¹"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr "½ªÎ»¸å¥½¡¼¥¹¤òºï½ü¤·¤Þ¤¹"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "½ªÎ»¸å¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
#, fuzzy
msgid "generate PGP/GPG signature"
msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "BuildRoot ¤È¤·¤Æ <dir> ¤òÍѤ¤¤Þ¤¹"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "¥¿¥¤¥à¥Á¥§¥Ã¥¯´ü¸Â¤òÀßÄꤷ¤Þ¤¹(0¤Ç̵¸ú)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -818,64 +823,64 @@ msgstr ""
"\t\t\t ¥¸¤òºîÀ®¤·¡¢spec¥Õ¥¡¥¤¥ë¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë¡¢¥Ñ¥Ã¥Á¡¢\n"
"\t\t\t ¥¢¥¤¥³¥ó¤òºï½ü¤·¤Þ¤¹"
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "--rebuild ¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤·¤Þ¤»¤ó"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤òÄɲä·¤Þ¤¹"
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "PGP ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
#, fuzzy
msgid "skip any GPG signatures"
msgstr "GPG ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "MD5 ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "Í­¸ú¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Â¸ºß¤¹¤ë¤³¤È¤ò³Î¤«¤á¤Þ¤¹"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "´û¸¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -883,7 +888,7 @@ msgstr ""
"-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
"¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Îµö²Ä°À­¤ËÀßÄꤷ¤Þ¤¹"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -891,77 +896,85 @@ msgstr ""
"-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
"¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î½êÍ­¼Ô¤È¥°¥ë¡¼¥×¤ËÀßÄꤷ¤Þ¤¹"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "°ì¤Ä¤Î¥á¥¸¥ã¡¼¥â¡¼¥É¤Î¤ß¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u ¤È --uninstall ¤Ï¤â¤Ï¤äÆ°ºî¤·¤Þ¤»¤ó\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "ºÆÇÛÃÖ¤Ï / ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "ºÆÇÛÃÖ¤Ï = ¤ò´Þ¤ó¤Ç¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "ºÆÇÛÃÖ¤Ï = ¤Î¼¡¤Ë / ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "½ü³°¤¹¤ë¥Ñ¥¹¤Ï / ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, fuzzy, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "°ú¿ô½èÍý(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "Ì䤤¹ç¤ï¤»/¸¡¾Ú¤Ï°ìÅ٤˰ì¤Ä¤·¤«¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥é¥°"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥©¡¼¥Þ¥Ã¥È"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥½¡¼¥¹"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢¥½¡¼¥¹ºï½ü¡¢¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ëºï½ü»þ¤Î¤ß¶¯À©¤Ç¤­¤"
"Þ¤¹"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ßºÆÇÛÃ֤Ǥ­¤Þ¤¹"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
@@ -969,80 +982,80 @@ msgstr ""
"--relocate ¤È --excludepath "
"¤Ï¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ¤Ï¿·µ¬¤Ë¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ¤Ø¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ¤È --includedocs ¤Ï¤É¤Á¤é¤«°ìÊý¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "-ignoreos ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "-ignoresize ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr "--noscripts ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr "--notriggers ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1050,13 +1063,13 @@ msgid ""
msgstr ""
"--nodeps ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ÎºîÀ®¡¢¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢ºîÀ®»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1064,101 +1077,101 @@ msgstr ""
"--root (-r) "
"¤Ï¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢Ì䤤¹ç¤ï¤»¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹ºÆ¹½ÃÛ»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage ¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp ¤Ï½ð̾¸¡ºº»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg ¤Ï½ð̾¸¡ºº»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 ¤Ï½ð̾¸¡ºº¤È¥Ñ¥Ã¥±¡¼¥¸¸¡¾Ú»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr "½ð̾¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó\n"
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
#, fuzzy
msgid "pgp not found: "
msgstr "pgp ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÀµ¾ï¤Ç¤¹¡¥\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr "¼Â¹Ô¼ºÇÔ\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "½ð̾¸¡ºº¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "½ð̾¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¤ÎÌ䤤¹ç¤ï¤»¤Î¤¿¤á¤Ë;ʬ¤Ê°ú¿ô¤¬¤¢¤ê¤Þ¤¹"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¤Î¸¡¾Ú¤Î¤¿¤á¤Ë;ʬ¤Ê°ú¿ô¤¬¤¢¤ê¤Þ¤¹"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -1182,373 +1195,430 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤«¤é¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤Î¥¨¥é¡¼\n"
msgid "cannot re-open payload: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "»ÈÍÑË¡: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " °Ê²¼¤Î°ú¿ô¤Ï¤¹¤Ù¤Æ¤Î¥â¡¼¥É¤Ç»ÈÍѤǤ­¤Þ¤¹:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
+
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr "¥Õ¥¡¥¤¥ë̾¤È°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ÎÂå¤ê¤Ë ftp URL ¤ò»È¤¨¤ë¤è¤¦(-p ¤òÍѤ¤¤Æ)"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢Ì䤤¹ç¤ï¤»¤·¤Þ¤¹:"
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " ¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "<file> ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
"(̤¥¤¥ó¥¹¥È¡¼¥ë)¥Ñ¥Ã¥±¡¼¥¸ <packagefile> ¤ò\n"
"Ì䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "<cap> ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr ""
"<cap> ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
"Ì䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " ¾ðÊóÁªÂò¥ª¥×¥·¥ç¥ó:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Þ¤¹"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Þ¤¹"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "[¥¢¥ó]¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Þ¤¹"
-#: rpmqv.c:472
+#: rpmqv.c:478
#, fuzzy
msgid "show the trigger scriptlets contained in the package"
msgstr ""
"¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Þ\n"
"\t\t\t ¤¹"
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
"¼Â¹Ô¤·¤Þ¤»¤ó"
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë̾Á°¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "´û¸¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤ·¤Ê¤¤¤Î¤Ë --dbpath ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤¹"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -1572,6 +1642,13 @@ msgstr "%s ¤Î¼Â¹Ô¤Ë¼ºÇÔ (%s)"
msgid "Bad exit status from %s (%s)"
msgstr "%s ¤ÎÉÔÀµ¤Ê½ªÎ»¥¹¥Æ¡¼¥¿¥¹ (%s)"
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr "¹½Ê¸²òÀÏÃæ¤Îʸˡ¥¨¥é¡¼ =="
@@ -1796,15 +1873,23 @@ msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿:"
msgid "Processing files: %s-%s-%s\n"
msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%s-%s\n"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
-msgstr "RPMERR_INTERNAL: getUname() ¤Î¸Â³¦¤Ë㤷¤Þ¤·¤¿\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
-msgstr "RPMERR_INTERNAL: getGname() ¤Î¸Â³¦¤Ë㤷¤Þ¤·¤¿\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr "¥Û¥¹¥È̾¤òÀµ¼°¤Ê¤â¤Î¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -3077,7 +3162,7 @@ msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
@@ -3142,7 +3227,7 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
msgid "record %d could not be read\n"
msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -3423,104 +3508,104 @@ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¿ô¤¨¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òõ¤·¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤È¤·¤Æ...\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤·¤Þ¤·¤¿\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ "
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "°Í¸À­¤Î·çÇ¡:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
@@ -3826,100 +3911,108 @@ msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼"
msgid "logging into %s as %s, pw %s\n"
msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n"
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== ¥¢¥¯¥Æ¥£¥Ö %d ¥¨¥ó¥×¥Æ¥£ %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr "¥Þ¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr "¥Þ¥¯¥í %%%s ¤Ï opts ¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr "¥Þ¥¯¥í %%%s ¤Ï¶õ¤Î¥Ü¥Ç¥£¤Ç¤¹"
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr "¥Þ¥¯¥í %%%s ¤Ï¿­Ä¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%undefine)"
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, fuzzy, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礭¤¤"
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, fuzzy, c-format
msgid "Unterminated %c: %s"
msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s"
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ­¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
#, fuzzy
msgid "Macro %%%.*s not found, skipping"
msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡¢¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥Õ¥í¡¼"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "¥Õ¥¡¥¤¥ë %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "·Ù¹ð: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
+msgstr "(¥¨¥é¡¼ 0x%x)"
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "¥¨¥é¡¼: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "·Ù¹ð: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3967,6 +4060,12 @@ msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
msgid "failed to create %s: %s\n"
msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+#~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#~ msgstr "RPMERR_INTERNAL: getUname() ¤Î¸Â³¦¤Ë㤷¤Þ¤·¤¿\n"
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#~ msgstr "RPMERR_INTERNAL: getGname() ¤Î¸Â³¦¤Ë㤷¤Þ¤·¤¿\n"
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "ÆâÉôŪ¤Ê¥¨¥é¡¼ (rpm ¤Î¥Ð¥°?)"
diff --git a/po/ko.po b/po/ko.po
index f12668c63..44fa0fd1f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/no.po b/po/no.po
index c817bd40d..96fa1212d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-08-04 02:59+02:00\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "kan ikke åpne %s/packages.rpm\n"
@@ -23,1067 +23,1080 @@ msgstr "feil med avhengigheter under bygging:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Kunne ikke åpne spec fil %s: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "Kunne ikke åpne tar rør: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "Feil under lesing av spec fil fra %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "Feil under endring av navn fra %s til %s: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "kunne ikke opprette %s: %s\n"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Filen er ikke en vanlig fil: %s\n"
-#: build.c:221
-#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+#: build.c:224
+#, fuzzy, c-format
+msgid "File %s does not appear to be a specfile."
msgstr "Fil %s ser ikke ut til å være en spec fil.\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformene: %s\n"
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr "Bygger for mål %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versjon %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright © 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr "Bruk: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <katalog>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <katalog>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <fil>] [--ignorearch] [--dbpath <katalog>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <katalog>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <vert>] [--ftpport <port>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <vert>] [--httpport <port>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--justdb] [--noorder] [--relocate oldpath=nysti]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <sti>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] fil1.rpm ... filN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
" [--oldpackage] [--root <katalog>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <fil>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <katalog>] [--prefix "
"<katalog>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httpproxy <vert>] [--httpport <port>] "
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate oldpath=nysti]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <sti>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " fil1.rpm ... filN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <katalog>] [--rcfile <fil>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr " [--triggeredby]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr " [--provides] [--triggers] [--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <katalog>] [mål]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <katalog>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [mål]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [mål]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [mål]"
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " rpm {--freshen -F} fil1.rpm ... filN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <katalog>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] pakke1 ... pakkeN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " pakke1 ... pakkeN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr "Bruk:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "skriv ut denne meldingen"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "skriv ut hvilken versjon av rpm som brukes"
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr " Alle modi støtter følgende argumenter:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr " --define '<navn> <kropp>'"
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr "definér makro <navn> med verdi <kropp>"
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr " --eval '<navn>+' "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr "skriv ut utvidelsen av makro <navn> til stdout"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <kmd> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "send stdout til <kmd>"
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr " --rcfile <fil> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "bruk <fil> i stedet for /etc/rpmrc og $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr "vis endelig rpmrc og makrokonfigurasjon"
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "gi litt mer informasjon"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "skriv ut mye informasjon (for feilsøking)"
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" Installér, oppgradér og spør (med -p) tillater bruk av URLer i stedet"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " for filnavn i tillegg til følgende alternativer:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <vert> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "vertsnavn eller IP for ftp proxy"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <vert> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "portnummer for ftp tjener (eller proxy)"
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr " --httpproxy <vert> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "vertsnavn eller IP for http proxy"
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "portnummer for http tjener (eller proxy)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "spørringsmodus"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <katalog> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "bruk <katalog> som katalog for databasen"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <spfmt>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr "bruk <spfmt> som headerformat (impliserer --info)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <katalog> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivåkatalog"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Alternativer for pakkespesifikasjon:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "spør i alle pakker"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <fil>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "spør pakke som eier <fil>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <pakkefil>+ "
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "spør (uinstallert) pakke <pakkefil>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <pakke>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "spør pakker utløst av <pakke>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <cap>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "vis pakkens endringslogg"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "vis pakkens filliste"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "vis filtilstander (impliserer -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "list kun dokumentasjonsfiler (impliserer -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "vis kun konfigurasjonfiler (impliserer -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "list pakkeavhengigheter"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "skriv ut de forskjellige [av]installasjonsskriptene"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr "vis utløserskriptene som finnes i pakken"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "ikke verifiser filens md5 sjekksum"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "ikke verifiser filattributter"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <pakkefil>"
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <pakkefil> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "installér pakke"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <sti>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr "hopp over filer i sti <sti>"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "ikke installer dokumentasjon"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "ikke verifiser pakkearkitektur"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "ikke sjekk diskplass før installasjon"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "ikke verifiser operativsystem for pakken"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "installér dokumentasjon"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "oppdatér databasen, men ikke modifiser filsystemet"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "ikke kjør noen installasjonsskript"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr "ikke kjør skript som utløses av denne pakken"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "installér selv om pakken erstatter installerte filer"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "reinstallér selv om pakken allerede er installert"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "ikke installér, men si ifra om det ville virke eller ikke"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "oppgradér pakke (samme alternativ som --install, plus)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "slett (avinstallér) pakke"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "ikke kjør noen pakkespesifikke skript"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "bygg pakke, hvor <steg> er ett av:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "prep (pakk ut kildekoden og legg til patcher)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "listesjekk (utfør noen kontroller på %filer)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompilér (prep og kompilér)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "installér (prep, kompilér, installér)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "binær pakke (prep, kompilér, installér, pakk)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "bin/src pakke (prep, kompilér, installér, pakk)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "hopp rett til spesifisert steg (kun for c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "fjern byggtréet når ferdig"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr "fjern kildekoden når ferdig"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr "fjern specfilen når ferdig"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr "generér PGP/GPG signatur"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "bruk <katalog> som byggrot"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "ikke kjør noen steg"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "som --rebuild, men ikke bygg noen pakke"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "signér en pakke (forkast nåværende signatur)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "legg til signatur til en pakke"
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr " -K <pkg>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "verifisér pakkesignatur"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "hopp over PGP-signaturer"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr "hopp over GPG-signaturer"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "hopp over MD5-signaturer"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "sjekk at en gyldig database eksisterer"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "bygg opp igjen databasen fra den eksisterende databasen"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "kun ett større modi kan spesifiseres"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Bruk -e eller --erase i stedet.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "relokasjoner må begynne med en /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "relokasjoner må inneholde et ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "relokasjoner må ha et / etter ="
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr "eksluderingssti må begynne med en /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1105,339 +1118,408 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+#, fuzzy
+msgid "'<name> <body>'"
+msgstr " --define '<navn> <kropp>'"
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "skriv ut utvidelsen av makro <navn> til stdout"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
-#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
-msgstr ""
+#: rpmqv.c:295
+#, fuzzy, c-format
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgstr " rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
-#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
+" [--rcfile <fil>] [--ignorearch] [--dbpath <katalog>]"
-#: rpmqv.c:327
-#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <fil>]"
-#: rpmqv.c:331
+#: rpmqv.c:319
+#, fuzzy, c-format
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+" rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
+
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <katalog>] [--rcfile <fil>]"
+
+#: rpmqv.c:333
+#, fuzzy, c-format
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgstr ""
+" rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]"
+
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=plattform1[,plattform2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] [--rmspec] specfil"
-#: rpmqv.c:340
-#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
-msgstr ""
+#: rpmqv.c:346
+#, fuzzy, c-format
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgstr " [--rmsource] [--rmspec] specfil"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
-#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
-msgstr ""
+#: rpmqv.c:353
+#, fuzzy, c-format
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgstr " rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
-#: rpmqv.c:348
-#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
-msgstr ""
+#: rpmqv.c:354
+#, fuzzy, c-format
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgstr " rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
-#: rpmqv.c:349
-#, c-format
+#: rpmqv.c:355
+#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
+" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
-msgstr ""
+#: rpmqv.c:402
+#, fuzzy
+msgid " --eval '<expr>+' "
+msgstr " --eval '<navn>+' "
+
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "skriv ut utvidelsen av makro <navn> til stdout"
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+#, fuzzy
+msgid " --macros <file:...> "
+msgstr " --rcfile <fil> "
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr " -f <fil>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr " -p <pakkefil>+ "
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr " --triggeredby <pakke>"
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr "spør/verifisér pakker utløst av <pakke>"
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Bruk -e eller --erase i stedet.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1460,6 +1542,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1679,15 +1768,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2903,7 +3000,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2967,7 +3064,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3244,104 +3341,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan ikke åpne pakkedatabase i %s\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "fil %s trenger en nyere versjon av RPM\n"
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke åpne %s: %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3621,99 +3718,106 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "Overflyt i målbuffer"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "Fil %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "Fil %s er mindre enn %d bytes"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "advarsel: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
+msgstr ""
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "fatal feil: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "feil: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "fatal feil: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "advarsel: "
#: rpmio/rpmmalloc.c:13
#, c-format
diff --git a/po/pl.po b/po/pl.po
index 7e0dcbaa8..d21ff2385 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
@@ -30,654 +30,659 @@ msgstr "niespe³nione zale¿no¶ci:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Nie mo¿na otworzyæ pliku spec: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "Otwarcie potoku tara nie powiod³o siê: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "Odczytanie pliku spec z %s nie powiod³o siê\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "Zmiana nazwy %s na %s nie powiod³a siê\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "stat nie powiod³o siê %s: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Plik: %s nie jest regularnym plikiem\n"
-#: build.c:221
+#: build.c:224
#, fuzzy, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr "%s nie wygl±da na pakiet RPM\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Budowanie dla platform: %s\n"
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr "Budowanie dla %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM wersja %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
#, fuzzy
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Program mo¿e byæ swobodnie rozpowszechniany na warunkach licencji GNU"
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "U¿ycie: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <katalog>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <katalog>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <katalog>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <host>] [--ftpport <port>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <host>] [--httpport <port>] "
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--noorder] [--relocate stara-¶cie¿ka=nowa-¶cie¿ka]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <¶cie¿ka>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] plik1.rpm ... plikN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
" [--oldpackage] [--root <katalog>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <plik>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <katalog>] [--prefix "
"<katalog>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httpproxy <host>] [--httpport <port>] "
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--noorder] [--relocate stara-¶cie¿ka=nowa-¶cie¿ka]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <¶cie¿ka>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " plik1.rpm ... plikN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <katalog>] [--rcfile <plik>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [cele]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--ftpport <port>] [--provides] [--triggers] [--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <katalog>] [cele]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <katalog>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [cele]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [cel]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [cel]"
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " plik1.rpm ... plikN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <katalog>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] pakiet1 ... pakietN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " pakiet1 ... pakietN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "u¿ycie:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "wy¶wietl ten tekst"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " wszystkie tryby pracy pozwalaj± u¿yæ nastêpuj±cych argumentów:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " --pipe <komenda> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <komenda> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "przeka¿ standartowe wyj¶cie do <komenda>"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " --rcfile <plik> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "u¿yj <plik> zamiast /etc/rpmrc i $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "wy¶wietlaj nieco wiêcej komunikatów"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "wy¶wietlaj BARDZO du¿o komunikatów (dla odpluskwiania)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" instalacja, uaktualnianie i odpytywanie (z opcj± -p) pozwalaj± u¿yæ URL'a "
"ftp zamiast"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " nazwy pliku tak jak i nastêpuj±cych opcji:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <host> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "nazwa lub numer IP maszyny bêd±cej ftp proksy"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "numer portu serwera ftp (lub proksy)"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --httpproxy <host> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "nazwa lub IP hosta bêd±cego http proksy"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "numer portu serwera http (albo proksy)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "tryb odpytywania"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <katalog> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "u¿yj <katalog> jako katalogu bazy pakietów"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <format zapytania>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "u¿yj <format zapytania> jako formatu nag³ówka (dotyczy -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <katalog> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Opcje selekcjonuj±ce pakiety:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "odpytuj wszystkie pakiety"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <plik>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "zapytaj do jakiego pakietu nale¿y <plik>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <nazwa pakietu>+ "
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "odpytaj (niezainstalowany) pakiet <nazwa pakietu>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <pakiet>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "odpytaj pakiety zahaczane przez <pakiet>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <zas>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "odszukaj pakiety udostêpniaj±ce zasób <zas>"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr " --whatrequires <zas>"
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Opcje odpytuj±ce pakiety:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "wy¶wietl informacjê o pakiecie"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "wy¶wietl wykaz zmian dokonanych w pakiecie"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "wy¶wietl listê plików zawartych w pakiecie"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "poka¿ statusy plików (dotyczy -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "wy¶wietl tylko pliki dokumentacji (dotyczy -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "wy¶wietl tylko pliki konfiguracyjne (dotyczy -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
"poka¿ wszystkie informacje o ka¿dym pliku (musi byæ u¿yte z -l, -c lub -d)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "wypisz zasoby udostêpniane przez pakiet"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "wypisz zale¿no¶ci pakietu"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "wy¶wietl skrypty [de]instalacyjne"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr "wy¶wietl trigger skrypty zawarte w pakiecie"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr "sprawd¼ stan pakietu (u¿ywa tych samych opcji co -q)"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "nie sprawdzaj zale¿no¶ci pakietu"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "nie sprawdzaj sum kontrolnych md5 plików"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "nie sprawdzaj atrybutów plików"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "wypisz etykiety w³asno¶ci, o które mo¿na zapytaæ"
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <nazwa pakietu>"
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <nazwa pakietu> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "instaluj pakiet"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <¶cie¿ka>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "przesuñ pliki z drzewa <stara-¶cie¿ka> do drzewa <nowa-¶cie¿ka>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <katalog> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "przesuñ pliki pakietu do drzewa <katalog>, je¶li jest przesuwalny"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "nie instaluj dokumentacji"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "wy¶wietlaj znaki hash przy instalacji (fajne z -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by "
"pominêto"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "nie sprawdzaj architektury systemu"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "nie sprawdzaj zajêto¶ci dysku przed instalacj±"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "nie sprawdzaj rodzaju systemu operacyjnego"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "zainstaluj dokumentacjê"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "od¶wie¿ bazê, ale nie modyfikuj systemu plików"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr "nie zmieniaj kolejno¶ci instalacji pakietów by zapewniæ zale¿no¶ci"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "wy¶wietlaj stan instalacji w procentach"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "instaluj nawet gdy pakiet zastêpuje inne zainstalowane pliki"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "przeinstaluj je¶li pakiet jest ju¿ zainstalowany"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "nie instaluj, podaj tylko czy instalacja zadzia³a czy nie"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr " --upgrade <nazwa pakietu>"
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr " -U <nazwa pakietu> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "uaktualnij pakiet (te same opcje jak --install, plus)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -685,15 +690,15 @@ msgstr ""
"uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
"uaktualniania)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr " --erase <pakiet>"
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "usuñ (odinstaluj) pakiet"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -701,102 +706,102 @@ msgstr ""
"usuñ wszystkie pakiety, które spe³niaj± wzorzec <pakiet> (zazwyczaj "
"wy¶wietlany jest b³±d gdy <pakiet> opisuje wiele pakietów)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<etap> <plik-spec> "
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr " -t<etap> <plik-tar> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "buduj pakiet, gdzie <etap> to:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "preparuj (rozpakuj ¼ród³a i na³ó¿ ³aty)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
"sprawdzanie z listy (wykonuje kilka podstawowych weryfikacji na %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompiluj (preparuj i kompiluj)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "instaluj (preparuj, kompiluj i instaluj)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "pakiet binarny/¼ród³owy (preparuj, kompiluj, instaluj, pakiet)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "przejd¼ od razu do podanego etapu (tylko dla c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "usuñ budowane drzewo po skoñczeniu"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr "usuñ ¼ród³a po zakoñczeniu"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "usuñ speca po zakoñczeniu"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr "generuj sygnaturê PGP/GPG"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr " --buildroot <katalog>"
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "u¿yj <katalog> jako korzeñ budowanego drzewa"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr " --target=<platforma>+"
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr "buduj pakiety dla platform docelowych platforma1...platformaN."
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "nie wykonuj ¿adnych etapów"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr " --timecheck <sekundy>"
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "ustaw sprawdzanie czasu do ilo¶ci <sekund> (0 wy³±cza)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <pkt_¼ród³> "
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -804,65 +809,65 @@ msgstr ""
"instaluj pakiet ¼ród³owy, buduj pakiet binarny i usuñ plik spec, ¼ród³a, "
"³aty i ikony"
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr " --recompile <pkt_¼ród³>"
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "jak --rebuild, ale nie buduj ¿adnych pakietów"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr " --resign <pakiet>+ "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr " --addsign <pakiet>+ "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "dodaj sygnaturê do pakietu"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <pakiet>+ "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <pakiet>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "sprawd¼ sygnaturê pakietu"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "pomiñ wszelkie sygnatury PGP"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr "pomiñ wszelkie sygnatury GPG"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "pomiñ wszelkie sygnatury MD5"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "upewnij siê, ¿e poprawna baza istnieje"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "przebuduj istniej±c± bazê"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -870,7 +875,7 @@ msgstr ""
"ustaw prawa dostêpu takie jak zapisano w bazie pakietów (u¿ywa tych samych "
"opcji co -q)"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -878,138 +883,146 @@ msgstr ""
"ustaw w³a¶ciciela i grupê takie jak zapisano w bazie pakietów (u¿ywa tych "
"samych opcji co -q)"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "tylko jeden g³ówny tryb pracy mo¿e byæ podany"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u i --uninstall nie s± ju¿ obs³ugiwane i nie pracuj±.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "U¿yj -e lub --erase\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "drzewa przesuniêæ musz± zaczynaæ sie od /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "specyfikacja przesuniêcia musi zawieraæ ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "specyfikacja przesuniêcia musi zawieraæ / po ="
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr "¶cie¿ki wy³±czeñ musz± siê zaczynaæ od /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "B³±d wewnêtrzny w przetwarzaniu argumentu (%d) :-(\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "tylko jeden typ odpytywania/sprawdzania mo¿na wykonaæ na raz"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "b³êdna konstrukcja argumentów odpytywania"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "tylko instalacjê, uaktualnienie i usuwanie ¼róde³ mo¿na wymusiæ"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "przesuwania plików mo¿na dokonaæ tylko w trakcie instalacji"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate i --excludepath mo¿na u¿yæ tylko w trakcie instalacji nowych "
"pakietów"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix mo¿na u¿yæ tylko w trakcie instalacji nowych pakietów"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty dla --prefix musz± siê rozpoczynaæ od /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "nie mo¿na jednocze¶nie u¿yæ --excludedocs i --includedocs"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mo¿na u¿yæ tylko w trakcie usuwania pakietów"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -1017,7 +1030,7 @@ msgstr ""
"--noscripts mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub sprawdzania "
"pakietów"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
@@ -1025,7 +1038,7 @@ msgstr ""
"--notriggers mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub sprawdzania "
"pakietów"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1034,14 +1047,14 @@ msgstr ""
"--nodeps mo¿na u¿yæ tylko w trakcie budowania, instalacji, usuwania lub "
"sprawdzania pakietów"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub budowania pakietów"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1049,98 +1062,98 @@ msgstr ""
"--root (-r) mo¿na u¿yæ tylko w trakcie instalacji, usuwania, sprawdzania "
"pakietów lub przebudowywania bazy"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty dla --root (-r) musz± siê rozpoczynaæ od /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage mo¿na u¿yæ tylko podczas aktualizacji"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp mo¿na u¿yæ tylko w trakcie sprawdzania sygnatury"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg mo¿na u¿yæ tylko podczas sprawdzania sygnatury"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"--nomd5 mo¿na u¿yæ tylko podczas sprawdzania sygnatury i weryfkiacji pakietu"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr "brak dostêpu do pliku %s\n"
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr "nie znaleziono pgp: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr "Podaj has³o: "
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Weryfikacja has³a nieudana\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Has³o jest prawid³owe.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "B³êdny %%_signature spec w pliku makra.\n"
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr "wykonanie nie powiod³o siê\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "nie podano nazwy pakietu do sprawdzenia sygnatury"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "nie podano nazwy pakietu do podpisania"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "nie podano nazw plików do usuniêcia"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "zbyt wiele argumentów dla odpytywania wszystkich pakietów"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytañ"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr "zbyt wiele argumentów dla weryfikacji wszystkich pakietów"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
@@ -1162,144 +1175,202 @@ msgstr "b³±d odczytu nag³ówka z pakietu\n"
msgid "cannot re-open payload: %s\n"
msgstr "nie mo¿na otworzyæ pliku %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "U¿ycie: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " rpm {--initdb} [--dbpath <katalog>]"
-#: rpmqv.c:289
+#: rpmqv.c:295
#, fuzzy, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, fuzzy, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <plik>]"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <katalog>] [--rcfile <plik>]"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, fuzzy, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " rpm {--setperms} [-afpg] [cel]"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, fuzzy, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " rpm {--setugids} [-afpg] [cel]"
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile <plik>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=platforma1[,platforma2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] plik_spec"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " rpm {--rmsource} [--rcfile <plik>] [-v] plik_spec"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--rebuild} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... ¼ród³owyN.rpm"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--recompile} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... "
"¼ród³owyN.rpm"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " plik1.rpm ... plikN.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " wszystkie tryby pracy pozwalaj± u¿yæ nastêpuj±cych argumentów:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " --pipe <komenda> "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " --pipe <komenda> "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " --rcfile <plik> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " --dbpath <katalog> "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " --root <katalog> "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1307,259 +1378,264 @@ msgstr ""
" instalacja, uaktualnianie i odpytywanie (z opcj± -p) pozwalaj± u¿yæ URL'a "
"ftp zamiast"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " nazwy pliku tak jak i nastêpuj±cych opcji:"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <host> "
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --httpproxy <host> "
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Opcje selekcjonuj±ce pakiety:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "odpytuj wszystkie pakiety"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -f <plik>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "zapytaj do jakiego pakietu nale¿y <plik>"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -p <nazwa pakietu>+ "
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "odpytaj (niezainstalowany) pakiet <nazwa pakietu>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr " --triggeredby <pakiet>"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "odpytaj pakiety zahaczane przez <pakiet>"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr " --whatprovides <zas>"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "odszukaj pakiety udostêpniaj±ce zasób <zas>"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr " --whatrequires <zas>"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
-#: rpmqv.c:447
+#: rpmqv.c:453
#, fuzzy
msgid " --queryformat <qfmt> "
msgstr " --queryformat <format zapytania>"
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Opcje odpytuj±ce pakiety:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "wypisz zasoby udostêpniane przez pakiet"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "wypisz zasoby udostêpniane przez pakiet"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "wy¶wietl skrypty [de]instalacyjne"
-#: rpmqv.c:472
+#: rpmqv.c:478
#, fuzzy
msgid "show the trigger scriptlets contained in the package"
msgstr "wy¶wietl trigger skrypty zawarte w pakiecie"
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr " --install <nazwa pakietu>"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -i <nazwa pakietu> "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr " --excludepath <¶cie¿ka>"
-#: rpmqv.c:507
+#: rpmqv.c:513
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>"
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "odpytywanie pakietów zahaczanych przez pakiet"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " --prefix <katalog> "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr " --upgrade <nazwa pakietu>"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -U <nazwa pakietu> "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr " --erase <pakiet>"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<etap> <plik-spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -t<etap> <plik-tar> "
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "pakiet nie ma nazwy"
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " --buildroot <katalog>"
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " --target=<platforma>+"
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <pkt_¼ród³> "
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " --recompile <pkt_¼ród³>"
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " --resign <pakiet>+ "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " --addsign <pakiet>+ "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <pakiet>+ "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <pakiet>+ "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "przebuduj istniej±c± bazê"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "U¿yj -e lub --erase\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath podano dla operacji nie u¿ywaj±cej bazy"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do budowania"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "nie podano nazw plików tar do budowania"
@@ -1583,6 +1659,13 @@ msgstr "Wykonanie %s nie powiod³o siê (%s)"
msgid "Bad exit status from %s (%s)"
msgstr "B³êdny status wyj¶cia z %s (%s)"
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
#, fuzzy
msgid "syntax error while parsing =="
@@ -1806,15 +1889,23 @@ msgstr "Wyszukiwanie nie powiod³o siê"
msgid "Processing files: %s-%s-%s\n"
msgstr "Przetwarzanie plików: %s\n"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
-msgstr "RPMERR_INTERNAL: Limit trafieñ w getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
-msgstr "RPMERR_INTERNAL: Limit trafieñ w getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n"
@@ -3052,7 +3143,7 @@ msgstr "otwarcie %s nie powiod³o siê\n"
msgid "old format source packages cannot be queried\n"
msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s nie wygl±da na pakiet RPM\n"
@@ -3117,7 +3208,7 @@ msgstr "numer rekordu pakietu: %d\n"
msgid "record %d could not be read\n"
msgstr "nie mo¿na odczytaæ rekordu %d\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -3398,104 +3489,104 @@ msgstr "tworzenie katalogu: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr "zliczanie pakietów do zainstalowania\n"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "znaleziono %d pakietów\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "szukanie pakietów do ¶ci±gniêcia\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "¦ci±ganie %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "¶ci±gniêto %d pakietów\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie mo¿na otworzyæ pliku %s: %s"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie mo¿e byæ zainstalowany\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr "b³±d czytania z pliku %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "niespe³nione zale¿no¶ci:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" okre¶la wiele pakietów\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie mo¿na otworzyæ %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
@@ -3781,99 +3872,107 @@ msgstr "Nieznany lub nieoczekiwany b³±d"
msgid "logging into %s as %s, pw %s\n"
msgstr "logowanie do %s jako %s, has³o %s\n"
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktywny %d pusty %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(pusty)"
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(pusty)\n"
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr "Makro %%%s ma niezakoñczon± strukturê"
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "Makro %%%s ma niedozwolon± nazwê (%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr "Makro %%%s ma niezakoñczone opcje"
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr "Makro %%%s nie zawiera ¿adnych poleceñ"
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr "Rozwiniêcie makra %%%s nie powiod³o siê"
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr "Makro %%%s ma niedozwolon± nazwê (%%undefine)"
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d"
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "Nieznana opcja %c in %s(%s)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)"
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr "Niezakoñczone %c: %s"
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr "Napotkano nieprzetwarzalne makro po %%"
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr "Nie znaleziono makra %%%.*s, makro pominiête"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "Przepe³nienie bufora docelowego"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "Plik %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "Plik %s jest mniejszy ni¿ %d bajtów"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "ostrze¿enie: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
+msgstr "(b³±d 0x%x)"
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "fatalny b³±d: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "b³±d: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "fatalny b³±d: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "ostrze¿enie: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3920,6 +4019,16 @@ msgstr "nie mo¿na otworzyæ %s: %s"
msgid "failed to create %s: %s\n"
msgstr "utworzenie %s nie powiod³o siê\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " --rcfile <plik> "
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#~ msgstr "RPMERR_INTERNAL: Limit trafieñ w getUname()\n"
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#~ msgstr "RPMERR_INTERNAL: Limit trafieñ w getGname()\n"
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "b³±d wewnêtrzny (b³±d w rpm'ie?): "
diff --git a/po/pt.po b/po/pt.po
index 9c47c3f0d..a522b1193 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-08-01 21:11+01:00\n"
"Last-Translator: Pedro Morais <morais@poli.org>\n"
"Language-Team: pt <morais@poli.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-latin1\n"
"Content-Transfer-Encoding: none\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -25,1045 +25,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr "não consigo abrir ficheiro spec %s: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
-msgstr ""
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
+msgstr "não consigo abrir ficheiro spec %s: %s\n"
#. Give up
-#: build.c:147
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
+msgstr "não consigo abrir ficheiro spec %s: %s\n"
+
+#: build.c:172
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:174
+#: build.c:211
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:216
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "File %s is not a regular file."
msgstr ""
-#: build.c:221
+#: build.c:224
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1085,339 +1098,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
+msgstr ""
+
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1440,6 +1507,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1659,15 +1733,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2883,7 +2965,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2947,7 +3029,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3226,104 +3308,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3603,98 +3685,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6177363ac..d59594424 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,9 +2,9 @@
# Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
#
msgid ""
-msgstr "POT-Creation-Date: 2000-08-30 22:29-0400\n"
+msgstr "POT-Creation-Date: 2000-09-01 17:07-0400\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -21,46 +21,52 @@ msgid "Unable to open spec file %s: %s\n"
msgstr "Não consegui abrir: %s\n"
# , c-format
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, fuzzy, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr "Não consegui abrir: %s\n"
# , c-format
#. Give up
-#: build.c:147
+#: build.c:145
#, fuzzy, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr "Não consegui ler o arquivo spec de %s\n"
# , c-format
-#: build.c:174
+#: build.c:172
#, fuzzy, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr "Não consegui ler o arquivo spec de %s\n"
-#: build.c:214
+# , c-format
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "Não consegui abrir: %s\n"
+
+#: build.c:216
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "File %s is not a regular file."
msgstr ""
-#: build.c:221
+#: build.c:224
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "instale pacote"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
@@ -73,472 +79,472 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versão %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Este Software pode ser livremente redistribuido sob os termos da Licensa "
"Pública GNU (GPL)"
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "uso: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <diretório>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <diretório>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <arquivo>] [--ignorearch] [--dbpath "
"<diretório>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
#, fuzzy
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr " [--prefix <diretório>] [--ignoreos] [--nodeps]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <host>] [--ftpport <porta>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--ftpproxy <host>] [--ftpport <porta>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " [--nomd5] [alvos]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
#, fuzzy
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--ignoreos] [--nodeps] arquivo.rpm ... arquivoN.rpm"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
#, fuzzy
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " arquivo.rpm ... arquivoN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
" [--oldpackage] [--root <diretório>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <dir>] [--prefix "
"<diretório>]"
-#: rpm.c:220
+#: rpm.c:222
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--ftpproxy <host>] [--ftpport <porta>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
#, fuzzy
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--dbpath <diretório>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
#, fuzzy
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--nomd5] [alvos]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
#, fuzzy
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--provides] [--dump] [--dbpath <diretório>] [alvos]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
#, fuzzy
msgid " file1.rpm ... fileN.rpm"
msgstr " arquivo.rpm ... arquivoN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [alvos]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--dbpath <diretório>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
#, fuzzy
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
" [--provides] [--dump] [--dbpath <diretório>] [alvos]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <diretório>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [alvos]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [alvo]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [alvo]"
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " arquivo.rpm ... arquivoN.rpm"
-#: rpm.c:239
+#: rpm.c:241
#, fuzzy
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
"<arquivo>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
" [--dbpath <diretório>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " pacote1 ... pacoteN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
" rpm {--addsign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
-#: rpm.c:244
+#: rpm.c:246
#, fuzzy
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " pacote1 ... pacoteN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "uso:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "mostra esta mensagem"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "mostra a versão do programa rpm sendo usado"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " todos os modos suportam os seguintes argumentos:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " -b<estágio> <spec> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "mostra a versão do programa rpm sendo usado"
-#: rpm.c:293
+#: rpm.c:295
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "envia a saida padrão para <cmd>"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "use <arquivo> no lugar de /etc/rpmrc e $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "seja um pouco mais detalhado"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "seja _muito_ mais detalhado (para depuração)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" Instale, atualize e pesquise (com -p) permitem que sejam usadas URLs ftp "
"no lugar"
-#: rpm.c:306
+#: rpm.c:308
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " de nomes de arquivos bem como as seguintes opções:\n"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "nome do host ou IP do proxy ftp"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "número da porta do servidor ftp (ou proxy)"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
#, fuzzy
msgid "hostname or IP of http proxy"
msgstr "nome do host ou IP do proxy ftp"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
#, fuzzy
msgid "port number of http server (or proxy)"
msgstr "número da porta do servidor ftp (ou proxy)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "modo pesquisa"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "use <diretório> como diretório para o banco de dados"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "use s como formato do cabeçalho (implica -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "use <diretório> como diretório raiz"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Opcões para especificação de pacotes:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "pesquise todos os pacotes"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "pesquise pacote (não instalado) <arquivo-pacote>"
-#: rpm.c:332
+#: rpm.c:334
#, fuzzy
msgid " --triggeredby <pkg>"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpm.c:333
+#: rpm.c:335
#, fuzzy
msgid "query packages triggered by <pkg>"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpm.c:334
+#: rpm.c:336
#, fuzzy
msgid " --whatprovides <cap>"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpm.c:335
+#: rpm.c:337
#, fuzzy
msgid "query packages which provide <cap> capability"
msgstr "pesquise pacotes que fornecem a capacidade <i>"
-#: rpm.c:336
+#: rpm.c:338
#, fuzzy
msgid " --whatrequires <cap>"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpm.c:337
+#: rpm.c:339
#, fuzzy
msgid "query packages which require <cap> capability"
msgstr "pesquise pacotes que requerem capacidade <i>"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Opcões de selecão de informação"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "mostre informação do pacote"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
#, fuzzy
msgid "display the package's change log"
msgstr "mostre a lista de arquivos do pacote"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "mostre a lista de arquivos do pacote"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "mostre estados dos arquivos (implica -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "liste somente os arquivos de documentação (implica -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "liste somente os arquivos de configuração (implica -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -546,24 +552,24 @@ msgstr ""
"mostre todas as informações verificáveis para cada arquivo (deve ser usado "
"com -l, -c ou -d)"
-#: rpm.c:354
+#: rpm.c:356
#, fuzzy
msgid "list capabilities package provides"
msgstr "lista as capacidades que o pacote fornece"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "lista dependências do pacote"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "mostra as várias scripts de [des]instalação"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
@@ -571,147 +577,147 @@ msgstr ""
"verifique uma instalação de pacote usando as mesmas opções de especificação "
"de pacote do -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "não verifique as dependências do pacote"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "não verifique os checksums md5 do arquivo"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "não verifique os atributos dos arquivos"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "liste as etiquetas que podem ser usadas em um formato de pesquisa"
-#: rpm.c:379
+#: rpm.c:381
#, fuzzy
msgid " --install <packagefile>"
msgstr "instale pacote"
-#: rpm.c:380
+#: rpm.c:382
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "instale pacote"
-#: rpm.c:382
+#: rpm.c:384
#, fuzzy
msgid " --excludepath <path>"
msgstr " [--nomd5] [alvos]"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr " [--nomd5] [alvos]"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "não foi passado pacote para instalação"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "realoque o pacote para <diretório>, se realocável"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "não instale documentação"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "aliás para --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
#, fuzzy
msgid "don't verify package architecture"
msgstr "não verifique a arquitetura do pacote"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "não verifique o sistema operacional do pacote"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "instale documentação"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
#, fuzzy
msgid "do not reorder package installation to satisfy dependencies"
msgstr "não verifique as dependências do pacote"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "não execute nenhuma script de instalação"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "instale mesmo que o pacote substitua arquivos já instalados"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "reinstale se o pacote já estiver presente"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "não instale, mas diga se a instalação funcionará ou não"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "atualize pacote (mesmas opcões em --install, mais"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -719,15 +725,15 @@ msgstr ""
"atualize para uma versão mais velha do pacote (--force em atualizações não "
"faz isto automaticamente)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "apague (desinstale) pacote"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -735,109 +741,109 @@ msgstr ""
"remova todos os pacotes iguais a <pacote> (normalmente um erro é gerado se "
"<pacote> especificou múltiplos pacotes)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "não execute nenhuma script específica do pacote"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:458
+#: rpm.c:460
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "Constroi pacote, onde <estágio> é um dos seguintes:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "prep (descompacte fontes e aplique patches)"
# , c-format
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "cheque lista (faça algumas checagens em %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "compile (prep e compile)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "instale (prep, compile, instale)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "pacote binário (prep, compile, instale, pacote)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "pacote bin/src (prep, compile, instale, pacote)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "pule direto para o estágio especificado (somente para c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "remova a árvore de construção quando terminar"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr "remova a árvore de construção quando terminar"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "remova a árvore de construção quando terminar"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
#, fuzzy
msgid "generate PGP/GPG signature"
msgstr "gere assinatura PGP"
-#: rpm.c:482
+#: rpm.c:484
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
#, fuzzy
msgid "use <dir> as the build root"
msgstr "use s como o root da construção"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "não execute nenhum estágio"
-#: rpm.c:488
+#: rpm.c:490
#, fuzzy
msgid " --timecheck <secs> "
msgstr " -b<estágio> <spec> "
-#: rpm.c:489
+#: rpm.c:491
#, fuzzy
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "atribua S segundos ao tempo de checagem (0 o desabilita)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -845,68 +851,68 @@ msgstr ""
"instale pacote fonte, construa pacote binário e remova o arquivo spec, "
"fontes, patches e ícones."
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "como --rebuild, mas não construa nenhum pacote"
-#: rpm.c:497
+#: rpm.c:499
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "assine um pacote (descarte a assinatura corrente)"
-#: rpm.c:499
+#: rpm.c:501
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "adicione uma assinatura a um pacote"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<estágio> <spec> "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "verifique a assinatura do pacote"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "desconsidere quaisquer assinaturas PGP"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
#, fuzzy
msgid "skip any GPG signatures"
msgstr "desconsidere quaisquer assinaturas PGP"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "desconsidere quaisquer assinaturas MD5"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "certifique que um banco de dados válido existe"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -914,7 +920,7 @@ msgstr ""
"atribua as permissões dos arquivos para aquelas no banco de dados de pacotes "
"usando as mesmas opções de especificação de pacote do -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -922,159 +928,167 @@ msgstr ""
"atribua dono e grupo dos arquivos para aquelas no banco de dados de pacotes "
"usando as mesmas opções de especificação de pacote do -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "somente um modo principal pode ser especificado"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u e --uninstall foram descontinuados e não funcionam mais.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Use -e ou --erase no lugar.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
#, fuzzy
msgid "relocations must begin with a /"
msgstr "argumentos para o --dbpath devem começar com uma /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "argumentos para o --dbpath devem começar com uma /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "um tipo de pesquisa/verificação pode ser feita por vez"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "fonte de pesquisa não esperado"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "fonte de pesquisa não esperado"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "fonte de pesquisa não esperado"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "somente instalação e atualização podem ser forçadas"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr "--percent somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--prefix somente pode ser usada quando se está instalando novos pacotes"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
"--prefix somente pode ser usada quando se está instalando novos pacotes"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "argumentos para --prefix devem começar com uma /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) somente podem ser especificado durante instalações de pacotes"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
"--ignoreos somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr ""
"--ignoreos somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches somente pode ser especificado durante desinstalações de pacotes"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalações de pacotes"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test somente pode ser especificado durante [des]instalações e construções "
"de pacotes"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -1082,7 +1096,7 @@ msgstr ""
"--noscripts somente pode ser especificado durante [des]instalações e "
"verificações de pacotes"
-#: rpm.c:904
+#: rpm.c:912
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
@@ -1091,7 +1105,7 @@ msgstr ""
"--nodeps somente pode ser especificado durante [des]instalações e "
"verificações de pacotes"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1100,7 +1114,7 @@ msgstr ""
"--nodeps somente pode ser especificado durante [des]instalações e "
"verificações de pacotes"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1108,7 +1122,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalações e construções "
"de pacotes"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1116,24 +1130,24 @@ msgstr ""
"--root (-r) somente pode ser especificado durante [des]instalações, "
"pesquisas e reconstrução de bancos de dados"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumentos para --root (-r) devem começar com uma /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage somente pode ser usado durante a atualização de pacotes"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
@@ -1141,79 +1155,79 @@ msgstr ""
"--nopgp somente pode ser usado durante checagem de assinaturas e verificação "
"de pacotes"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
#, fuzzy
msgid "pgp not found: "
msgstr "não foi passado pacote para desinstalação"
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Checagem de pass phrase falhou\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Pass phrase ok.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign somente pode ser usado durante a construção de pacotes"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
#, fuzzy
msgid "exec failed\n"
msgstr "Construção falhou.\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "argumentos não esperados em --querytags"
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "nenhum pacote informado para checagem de assinatura"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "não foram passados pacotes para assinatura"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "não foi passado pacote para desinstalação"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "não foi passado pacote para instalação"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "não foi passado argumento para pesquisa"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "não foi passado argumento para verificação"
@@ -1237,147 +1251,206 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr "Não consegui abrir: %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "mostra a versão do programa rpm sendo usado"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "uso: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " rpm {--initdb} [--dbpath <diretório>]"
-#: rpmqv.c:289
+#: rpmqv.c:295
#, fuzzy, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <arquivo>] [--ignorearch] [--dbpath "
+"<diretório>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
"<arquivo>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, fuzzy, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " rpm {--setperms} [-afpg] [alvo]"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, fuzzy, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " rpm {--setugids} [-afpg] [alvo]"
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
"<arquivo>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
#, fuzzy
msgid " [--target=platform1[,platform2...]]"
msgstr " [--nomd5] [alvos]"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
" [--sign] [--test] [--timecheck <S>] arquivo-spec"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
" rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--rebuild} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " arquivo.rpm ... arquivoN.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " rpm {--resign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
" rpm {--addsign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " todos os modos suportam os seguintes argumentos:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "mostra a versão do programa rpm sendo usado"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1385,241 +1458,246 @@ msgstr ""
" Instale, atualize e pesquise (com -p) permitem que sejam usadas URLs ftp "
"no lugar"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " de nomes de arquivos bem como as seguintes opções:\n"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Opcões para especificação de pacotes:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "pesquise todos os pacotes"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "pesquise pacote (não instalado) <arquivo-pacote>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "pesquise pacotes que fornecem a capacidade <i>"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "pesquise pacotes que requerem capacidade <i>"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Opcões de selecão de informação"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "lista as capacidades que o pacote fornece"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "lista as capacidades que o pacote fornece"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "mostra as várias scripts de [des]instalação"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr "instale pacote"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr " [--nomd5] [alvos]"
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "não execute nenhuma script de instalação"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr " [--nomd5] [alvos]"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr "instale pacote"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr "instale pacote"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<estágio> <spec> "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Use -e ou --erase no lugar.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath passado para uma operação que não usa um banco de dados"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
@@ -1627,15 +1705,15 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalações e construções "
"de pacotes"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "não foram passados pacotes para reconstrução"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "não foi passado arquivo spec para construção"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "não foram passados arquivos tar para construção"
@@ -1668,6 +1746,13 @@ msgstr "Construção falhou.\n"
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1899,15 +1984,23 @@ msgstr "Não consegui abrir o pipe tar: %s\n"
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -3184,7 +3277,7 @@ msgstr "Construção falhou.\n"
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -3249,7 +3342,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "não foi passado pacote para instalação"
@@ -3548,21 +3641,21 @@ msgstr "RPM versão %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "Não consegui abrir: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
#, fuzzy
msgid "counting packages to install\n"
msgstr "não foi passado pacote para instalação"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "pesquise todos os pacotes"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
@@ -3575,92 +3668,92 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, fuzzy, c-format
msgid "Retrieving %s\n"
msgstr "RPM versão %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
# , c-format
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Não consegui abrir: %s\n"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "não foi passado pacote para instalação"
# , c-format
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "Não consegui abrir: %s\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "não foi passado pacote para instalação"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
#, fuzzy
msgid "failed dependencies:\n"
msgstr "lista dependências do pacote"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
#, fuzzy
msgid "removing these packages would break dependencies:\n"
msgstr "lista dependências do pacote"
# , c-format
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Não consegui abrir: %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3965,100 +4058,107 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
#, fuzzy
msgid "Macro %%%.*s not found, skipping"
msgstr "não foi passado pacote para desinstalação"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
# , c-format
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, fuzzy, c-format
msgid "File %s: %s"
msgstr "Não consegui ler o arquivo spec de %s\n"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
+msgstr ""
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
@@ -4108,6 +4208,10 @@ msgstr "Não consegui abrir: %s\n"
msgid "failed to create %s: %s\n"
msgstr "Não consegui abrir o pipe tar: %s\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " -b<estágio> <spec> "
+
# , c-format
#, fuzzy
#~ msgid "Unable to open %s for reading: %s."
diff --git a/po/ro.po b/po/ro.po
index bebc753ab..d75a63584 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -23,1045 +23,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1083,339 +1096,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1438,6 +1505,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1657,15 +1731,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2881,7 +2963,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2945,7 +3027,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3222,104 +3304,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3599,98 +3681,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/rpm.pot b/po/rpm.pot
index 7f0cc654f..a9af09b39 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-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/ru.po b/po/ru.po
index 8df19f783..52def7141 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-08-08 01:20+0300\n"
"Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -10,7 +10,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Date: 1999-04-03 12:20+0200\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ %s/packages.rpm\n"
@@ -24,470 +24,475 @@ msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÓÂÏÒËÉ:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ spec ÆÁÊÌÁ: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ tar: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ spec ÉÚ %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "îÅ ÍÏÇÕ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ ÏÂ %s: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "îÅ ÏÂÙÞÎÙÊ ÆÁÊÌ: %s\n"
-#: build.c:221
-#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+#: build.c:224
+#, fuzzy, c-format
+msgid "File %s does not appear to be a specfile."
msgstr "æÁÊÌ %s ÎÅ ÐÏÈÏÖ ÎÁ spec ÆÁÊÌ.\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "ãÅÌÅ×ÙÅ ÐÌÁÔÆÏÒÍÙ: %s\n"
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr "óÂÏÒËÁ ÄÌÑ ÃÅÌÅ×ÏÊ ÐÌÁÔÆÏÒÍÙ %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ×ÅÒÓÉÑ %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "íÏÖÅÔ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØÓÑ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL."
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <ËÁÔÁÌÏÇ>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <ËÁÔÁÌÏÇ>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁÌÏÇ>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <ËÁÔ.>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <ÁÄÒÅÓ>] [--ftpport <ÐÏÒÔ>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <ÁÄÒÅÓ>] [--httpport <ÐÏÒÔ>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--justdb] [--noorder] [--relocate "
"ÓÔÁÒÙÊÐÕÔØ=ÎÏ×ÙÊÐÕÔØ]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <ÐÕÔØ>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] file1.rpm ... fileN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
" [--oldpackage] [--root <ËÁÔÁÌÏÇ>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <ÆÁÊÌ>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <ËÁÔ.>] [--prefix <ËÁÔ.>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httpproxy <host>] [--httpport <ÐÏÒÔ>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate oldpath=newpath]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <ÐÕÔØ>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " file1.rpm ... fileN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr " [--triggeredby]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr " [--provides] [--triggers] [--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <ËÁÔÁÌÏÇ>] [ÃÅÌÉ]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <ËÁÔ>] [--nodeps] [--nofiles] [--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [ÃÅÌÉ]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [ÃÅÌØ]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [ÃÅÌØ]"
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " rpm {--freshen -F} ÆÁÊÌ1.rpm ... ÆÁÊÌN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <ËÁÔÁÌÏÇ>] [--noscripts] [--rcfile <ÆÁÊÌ>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <ËÁÔÁÌÏÇ>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] ÐÁËÅÔ1 ... ÐÁËÅÔN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <ÆÁÊÌ>] ÐÁËÅÔ1 ÐÁËÅÔ2 ... ÐÁËÅÔN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <ÆÁÊÌ>] ÐÁËÅÔ1 ÐÁËÅÔ2 ... ÐÁËÅÔN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ÆÁÊÌ>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " ÐÁËÅÔ1 ... ÐÁËÅÔN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <ÆÁÊÌ>] [--dbpath <ËÁÔÁÌÏÇ>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "×Ù×ÅÓÔÉ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "×Ù×ÅÓÔÉ ×ÅÒÓÉÀ ÉÓÐÏÌØÚÕÅÍÏÇÏ rpm"
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr " ÷ÓÅ ÒÅÖÉÍÙ ÐÏÄÄÅÒÖÉ×ÁÀÔ ÓÌÅÄÕÀÝÉÅ ÁÒÇÕÍÅÎÔÙ:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr " --define '<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'"
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr "ÏÐÒÅÄÅÌÉÔØ ÍÁËÒÏÓ <ÉÍÑ> ÓÏ ÚÎÁÞÅÎÉÅÍ <ÐÏÄÓÔÁÎÏ×ËÁ>"
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr " --eval '<name>+' "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <cmd> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "ÐÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × <cmd>"
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr " --rcfile <ÆÁÊÌ> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ÆÁÊÌ> ×ÍÅÓÔÏ /etc/rpmrc É $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "ÂÙÔØ ÎÅÍÎÏÇÏ ÒÁÚÇÏ×ÏÒÞÉ×ÅÅ"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "ÂÙÔØ ïþåîø ÒÁÚÇÏ×ÏÒÞÉ×ÙÍ (ÄÌÑ ÏÔÌÁÄËÉ)"
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" õÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ É ÚÁÐÒÏÓ (Ó -p) ÄÏÐÕÓËÁÀÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ftp URL "
"×ÍÅÓÔÏ"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " ÉÍÅÎ ÆÁÊÌÏ× Á ÔÁËÖÅ ÓÌÅÄÕÀÝÉÅ ÏÐÃÉÉ:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <ÁÄÒÅÓ> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ ftp proxy"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <ÐÏÒÔ> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "ÎÏÍÅÒ ÐÏÒÔÁ ftp-ÓÅÒ×ÅÒÁ (ÉÌÉ proxy)"
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr " --httpproxy <ÁÄÒÅÓ> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ http proxy"
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr " --httpport <ÐÏÒÔ> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "ÎÏÍÅÒ ÐÏÒÔÁ http-ÓÅÒ×ÅÒÁ (ÉÌÉ proxy)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "ÒÅÖÉÍ ÚÁÐÒÏÓÁ"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <ËÁÔÁÌÏÇ> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÁÔÁÌÏÇ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <qfmt>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <qfmt> ËÁË ÆÏÒÍÁÔ ÚÁÇÏÌÏ×ËÁ (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <ËÁÔÁÌÏÇ> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " ïÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÁËÅÔÁ:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "ÚÁÐÒÏÓÉÔØ ×ÓÅ ÐÁËÅÔÙ"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <ÆÁÊÌ>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "ÎÁÊÔÉ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ <ÆÁÊÌ>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <ÆÁÊÌ ÐÁËÅÔÁ>+ "
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "ÚÁÐÒÏÓÉÔØ (ÎÅÕÓÔÁÎÏ×ÌÅÎÎÙÊ) ÐÁËÅÔ <ÆÁÊÌ ÐÁËÅÔÁ>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <pkg>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÁÍÉ ÎÁ ÐÁËÅÔ <pkg>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <cap>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "ÎÁÊÔÉ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ <cap>"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr " --whatrequires <cap>"
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr "ÎÁÊÔÉ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓÁ <cap>"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " ïÐÃÉÉ ×ÙÂÏÒÁ ÉÎÆÏÒÍÁÃÉÉ:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ÐÁËÅÔÅ"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "×Ù×ÅÓÔÉ ÐÒÏÔÏËÏÌ ÉÚÍÅÎÅÎÉÊ ÐÁËÅÔÁ"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "×Ù×ÅÓÔÉ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÏ× (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "×Ù×ÅÓÔÉ ÔÏÌØËÏ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "×Ù×ÅÓÔÉ ÔÏÌØËÏ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -495,23 +500,23 @@ msgstr ""
"ÐÏËÁÚÁÔØ ×ÓÀ ËÏÎÔÒÏÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÄÌÑ ËÁÖÄÏÇÏ ÆÁÊÌÁ (ÄÏÌÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ "
"Ó -l, -c ÉÌÉ -d)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "ÐÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÅ ÐÁËÅÔÏÍ"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "ÐÏËÁÚÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "×Ù×ÅÓÔÉ ÒÁÚÎÏÏÂÒÁÚÎÙÅ [ÄÅ]ÉÎÓÔÁÌÌÑÃÉÏÎÎÙÅ ÓËÒÉÐÔÙ"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr "ÐÏËÁÚÁÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÙ, ÓÏÄÅÒÖÁÝÉÅÓÑ × ÐÁËÅÔÅ"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
@@ -519,141 +524,141 @@ msgstr ""
"×ÅÒÉÆÉÃÉÒÏ×ÁÔØ ÉÎÓÔÁÌÌÑÃÉÀ ÐÁËÅÔÁ, ÉÓÐÏÌØÚÕÑ ÔÅ ÖÅ ÏÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ "
"ÐÁËÅÔÁ, ÞÔÏ É -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÐÁËÅÔÁ"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÙÅ md5-ÓÕÍÍÙ ÆÁÊÌÏ×"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÁÔÔÒÉÂÕÔÙ ÆÁÊÌÏ×"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "×Ù×ÅÓÔÉ ÔÜÇÉ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ × ÆÏÒÍÁÔÅ ÚÁÐÒÏÓÁ"
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <ÆÁÊÌ ÐÁËÅÔÁ>"
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <ÆÁÊÌ ÐÁËÅÔÁ> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <ÐÕÔØ>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ × ÐÕÔÉ <ÐÕÔØ>"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <oldpath>=<newpath>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ ÉÚ <oldpath> × <newpath>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ × ÎÅÐÅÒÅÍÅÝÁÅÍÏÍ ÐÁËÅÔÅ"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <ËÁÔÁÌÏÇ> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÐÁËÅÔ × <ËÁÔÁÌÏÇ>, ÅÓÌÉ ÐÁËÅÔ ÜÔÏ ÐÏÚ×ÏÌÑÅÔ"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÏËÕÍÅÎÔÁÃÉÀ"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "×Ù×ÏÄÉÔØ \"#\" ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ (ÈÏÒÏÛÏ Ó -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÷óå ÆÁÊÌÙ, ÄÁÖÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ, ËÏÔÏÒÙÅ ÍÏÇÌÉ ÂÙ ÂÙÔØ "
"ÐÒÏÐÕÝÅÎÙ"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÁÒÈÉÔÅËÔÕÒÕ ÐÁËÅÔÁ"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï ÐÅÒÅÄ ÕÓÔÁÎÏ×ËÏÊ"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÏÐÅÒÁÃÉÏÎÎÕÀ ÓÉÓÔÅÍÕ ÐÁËÅÔÁ"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "ÕÓÔÁÎÏ×ÉÔØ ÄÏËÕÍÅÎÔÁÃÉÀ"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "ÏÂÎÏ×ÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ, ÎÏ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr "ÎÅ ÍÅÎÑÔØ ÐÏÒÑÄÏË ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ËÁËÉÈ-ÌÉÂÏ ÕÓÔÁÎÏ×ÏÞÎÙÈ ÓËÒÉÐÔÏ×"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÏ×, ×Ú×ÅÄÅÎÎÙÈ ÎÁ ÜÔÏÔ ÐÁËÅÔ"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "×Ù×ÏÄÉÔØ ÐÒÏÃÅÎÔ ÇÏÔÏ×ÎÏÓÔÉ ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÁÖÅ ÅÓÌÉ ÐÁËÅÔ ÐÅÒÅÐÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÅÓÌÉ ÐÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂÝÉÔØ ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr " --upgrade <ÆÁÊÌ ÐÁËÅÔÁ>"
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr " -U <ÆÁÊÌ ÐÁËÅÔÁ> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÐÁËÅÔÁ (ÔÅ ÖÅ ÏÐÃÉÉ, ÞÔÏ É Ó --install, ÐÌÀÓ)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -661,15 +666,15 @@ msgstr ""
"ÏÔËÁÔ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ÐÁËÅÔÁ (--force ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÄÅÌÁÅÔ ÜÔÏ "
"Á×ÔÏÍÁÔÉÞÅÓËÉ)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr " --erase <ÐÁËÅÔ> "
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "ÕÄÁÌÉÔØ (ÄÅÉÎÓÔÁÌÌÉÒÏ×ÁÔØ) ÐÁËÅÔ"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -677,101 +682,101 @@ msgstr ""
"ÕÄÁÌÉÔØ ×ÓÅ ÐÁËÅÔÙ, ÓÏ×ÐÁÄÁÀÝÉÅ Ó <ÐÁËÅÔ> (ÏÂÙÞÎÏ, ÅÓÌÉ <ÐÁËÅÔ> "
"ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÅÓËÏÌØËÉÍ ÐÁËÅÔÁÍ, ÇÅÎÅÒÉÒÕÅÔÓÑ ÏÛÉÂËÁ)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÓËÒÉÐÔÏ×, ÓÐÅÃÉÆÉÞÎÙÈ ÄÌÑ ÐÁËÅÔÁ"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<stage> <spec> "
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr " -t<stage> <tarball> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "ÓÏÂÒÁÔØ ÐÁËÅÔ, ÇÄÅ <stage> - ÏÄÎÏ ÉÚ:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "prep (ÉÓÐÏÌÎÉÔØ %prep)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "list check (ÐÒÏÉÚ×ÅÓÔÉ ÐÒÏ×ÅÒËÕ ÓÅËÃÉÉ %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "compile (ÉÓÐÏÌÎÉÔØ %prep É %build)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "install (ÉÓÐÏÌÎÉÔØ %prep, %build É %install)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "binary package (ÉÓÐÏÌÎÉÔØ %prep, %build, %install É ÓÏÚÄÁÔØ RPM)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
"bin/src package (ÉÓÐÏÌÎÉÔØ %prep, %build, %install, ÓÏÚÄÁÔØ RPM É SRPM)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "ÐÅÒÅÊÔÉ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ Ë ÕËÁÚÁÎÎÏÍÕ ÜÔÁÐÕ (ÔÏÌØËÏ ÄÌÑ c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÄÅÒÅ×Ï ÉÓÈÏÄÎÉËÏ×"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr "ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÉÓÈÏÄÎÉËb"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr "ÕÄÁÌÉÔØ spec-ÆÁÊÌ ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ PGP/GPG-ÐÏÄÐÉÓØ"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr " --buildroot <ËÁÔ.> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔ.> ËÁË ËÏÒÎÅ×ÏÊ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÁ"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr " --target=<ÐÌÁÔÆÏÒÍÁ>+"
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr "ÐÏÓÔÒÏÉÔØ ÐÁËÅÔÙ ÄÌÑ ÃÅÌÅ×ÙÈ ÐÌÁÔÆÏÒÍ ÐÌÁÔÆÏÒÍÁ1...ÐÌÁÔÆÏÒÍÁN"
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁÐÏ×"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr " --timecheck <secs> "
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "ÕÓÔÁÎÏ×ÉÔØ ÐÒÏ×ÅÒËÕ ×ÒÅÍÅÎÉ × <secs> ÓÅËÕÎÄ (0 ÏÔÍÅÎÑÅÔ ÅÅ)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <src_pkg> "
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -779,63 +784,63 @@ msgstr ""
"ÕÓÔÁÎÏ×ÉÔØ SRPM, ÓÏÂÒÁÔØ RPM É ÕÄÁÌÉÔØ spec-ÆÁÊÌ, ÆÁÊÌÙ Ó ÉÓÈÏÄÎÙÍÉ "
"ÔÅËÓÔÁÍÉ, ÐÁÔÞÉ É ÐÉËÔÏÇÒÁÍÍÙ."
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr " --recompile <src_pkg> "
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "ËÁË --rebuild, ÎÏ ÎÅ ÓÏÂÉÒÁÅÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr " --resign <pkg>+ "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr " --addsign <pkg>+ "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "ÄÏÂÁ×ÉÔØ ÐÏÄÐÉÓØ Ë ÐÁËÅÔÕ"
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr " --checksig <pkg>+"
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr " -K <ÐÁËÅÔ>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ PGP-ÐÏÄÐÉÓÉ"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ GPG-ÐÏÄÐÉÓÉ"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ MD5-ÐÏÄÐÉÓÉ"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "ÕÂÅÄÉÔØÓÑ, ÞÔÏ ÓÕÝÅÓÔ×ÕÅÔ ÐÒÁ×ÉÌØÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "ÐÅÒÅÓÔÒÏÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÉÚ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÂÁÚÙ"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -843,7 +848,7 @@ msgstr ""
"ÕÓÔÁÎÏ×ÉÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÆÁÊÌÏ× ÔÁËÉÅ ÖÅ, ËÁË × ÂÁÚÅ ÄÁÎÎÙÈ ÐÁËÅÔÁ, "
"ÉÓÐÏÌØÚÕÑ ÔÅ ÖÅ ÏÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÁËÅÔÁ, ÞÔÏ É -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -851,142 +856,150 @@ msgstr ""
"ÕÓÔÁÎÏ×ÉÔØ ÈÏÚÑÉÎÁ É ÇÒÕÐÐÕ ÆÁÊÌÏ× ÔÁËÉÅ ÖÅ, ËÁË × ÂÁÚÅ ÄÁÎÎÙÈ ÐÁËÅÔÁ, "
"ÉÓÐÏÌØÚÕÑ ÔÅ ÖÅ ÏÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÁËÅÔÁ, ÞÔÏ É -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÖÉÍÏ×"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "ÏÐÃÉÉ -u É --uninstall ÕÓÔÁÒÅÌÉ É ÂÏÌØÛÅ ÎÅ ÒÁÂÏÔÁÀÔ.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "÷ÍÅÓÔÏ ÎÉÈ ÉÓÐÏÌØÚÕÊÔÅ -e ÉÌÉ --erase.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÉÍÅÔØ / ÐÏÓÌÅ ="
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr "ÉÓËÌÀÞÅÎÉÑ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ ÁÒÇÕÍÅÎÔÏ× (%d) :-(\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "ÚÁ ÏÄÉÎ ÒÁÚ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌÎÅÎ ÔÏÌØËÏ ÏÄÉÎ ÔÉÐ ÐÒÏ×ÅÒËÉ ÉÌÉ ÚÁÐÒÏÓÁ"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏÞÎÉË ÚÁÐÒÏÓÁ"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏÞÎÉË ÚÁÐÒÏÓÁ"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏÞÎÉË ÚÁÐÒÏÓÁ"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"ÐÒÉÎÕÄÉÔÅÌØÎÙÍÉ ÍÏÇÕÔ ÂÙÔØ ÔÏÌØËÏ ÕÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ, ÕÄÁÌÅÎÉÅ ÉÓÈÏÄÎÉËÏ× "
"É spec-ÆÁÊÌÁ"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "ÆÁÊÌÙ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÏÄÎÁ ÉÚ ÏÐÃÉÊ --prefix ÉÌÉ --relocate"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"ÏÐÃÉÉ --relocate É --excludepath ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ "
"ÎÏ×ÙÈ ÐÁËÅÔÏ×"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "ÏÐÃÉÀ --prefix ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÎÏ×ÙÈ ÐÁËÅÔÏ×"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --prefix ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "ÏÐÃÉÑ --hash (-h) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "ÏÐÃÉÑ --percent ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "ÏÐÃÉÑ --replacefiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "ÏÐÃÉÑ --replacepkgs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "ÏÐÃÉÑ --excludedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "ÏÐÃÉÑ --includedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÏÄÎÁ ÉÚ ÏÐÃÉÊ --excludedocs ÉÌÉ --includedocs"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "ÏÐÃÉÑ --ignorearch ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "ÏÐÃÉÑ --ignoreos ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr "ÏÐÃÉÑ --ignoresize ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "ÏÐÃÉÑ --allmatches ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "ÏÐÃÉÑ --allfiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"ÏÐÃÉÑ --justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -994,7 +1007,7 @@ msgstr ""
"ÏÐÃÉÑ --noscripts ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
"×ÅÒÉÆÉËÁÃÉÉ ÐÁËÅÔÁ"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
@@ -1002,7 +1015,7 @@ msgstr ""
"ÏÐÃÉÑ --notriggers ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
"×ÅÒÉÆÉËÁÃÉÉ ÐÁËÅÔÁ"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -1010,7 +1023,7 @@ msgstr ""
"ÏÐÃÉÑ --nodeps ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ, ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
"×ÅÒÉÆÉËÁÃÉÉ ÐÁËÅÔÏ×"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1018,7 +1031,7 @@ msgstr ""
"ÏÐÃÉÑ --test ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÓÂÏÒËÅ "
"ÐÁËÅÔÁ"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1026,100 +1039,100 @@ msgstr ""
"ÏÐÃÉÑ --root (-r) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ, "
"ÚÁÐÒÏÓÁÈ ÐÁËÅÔÁ É ÐÅÒÅÓÔÒÏÅÎÉÉ ÂÁÚÙ ÄÁÎÎÙÈ"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --root (-r) ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
"ÏÐÃÉÑ --oldpackage ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÐÁËÅÔÏ×"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "ÏÐÃÉÑ --nopgp ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr "ÏÐÃÉÑ --nogpg ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"ÏÐÃÉÑ --nomd5 ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ É "
"×ÅÒÉÆÉËÁÃÉÉ ÐÁËÅÔÁ"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr "ÎÅÔ ÄÏÓÔÕÐÁ Ë ÆÁÊÌÕ %s\n"
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr "pgp ÎÅ ÎÁÊÄÅÎ: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr "÷×ÅÄÉÔÅ ÐÁÒÏÌØ: "
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "îÅ×ÅÒÎÙÊ ÐÁÒÏÌØ\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "ðÁÒÏÌØ ÐÒÉÎÑÔ.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ.\n"
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "ÏÐÃÉÑ --sign ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ ÐÁËÅÔÏ×"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr "ÚÁÐÕÓË ÎÅ ÕÄÁÌÓÑ\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÒÏ×ÅÒËÉ ÐÏÄÐÉÓÉ"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÏÄÐÉÓÉ"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "× ÚÁÐÒÏÓÅ ËÏ ×ÓÅÍ ÐÁËÅÔÁÍ ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr "× ÚÁÐÒÏÓÅ ×ÅÒÉÆÉËÁÃÉÉ ×ÓÅÈ ÐÁËÅÔÏ× ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
@@ -1141,352 +1154,418 @@ msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÈÅÄÅÒÁ ÉÚ ÐÁËÅÔÁ\n"
msgid "cannot re-open payload: %s\n"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+#, fuzzy
+msgid "'<name> <body>'"
+msgstr " --define '<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'"
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
"éÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
" rpm {--help}\n"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " %s {--initdb} [--dbpath <ËÁÔÁÌÏÇ>]\n"
-#: rpmqv.c:289
-#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#: rpmqv.c:295
+#, fuzzy, c-format
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " %s {--rebuilddb} [--rcfile <ÆÁÊÌ>] [--dbpath <ËÁÔÁÌÏÇ>]\n"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-#: rpmqv.c:313
-#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁÌÏÇ>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <ÆÁÊÌ>]"
+
+#: rpmqv.c:319
+#, fuzzy, c-format
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" %s {--erase -e} [--root <ËÁÔÁÌÏÇ>] [--noscripts] [--rcfile <ÆÁÊÌ>]\n"
-#: rpmqv.c:327
-#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
+
+#: rpmqv.c:333
+#, fuzzy, c-format
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" %s {--verify -V -y} [-afpg] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]\n"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " %s {--setperms} [-afpg] [ÃÅÌØ]\n"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " %s {--setugids} [-afpg] [ÃÅÌØ]\n"
-#: rpmqv.c:336
-#, c-format
+#: rpmqv.c:342
+#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
"<ÆÁÊÌ>]\n"
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=platform1[,platform2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] [--rmspec] specfile"
-#: rpmqv.c:340
-#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#: rpmqv.c:346
+#, fuzzy, c-format
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " %s {--rmsource} [--rcfile <ÆÁÊÌ>] [-v] specfile\n"
-#: rpmqv.c:341
-#, c-format
+#: rpmqv.c:347
+#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--rebuild} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
-#: rpmqv.c:342
-#, c-format
+#: rpmqv.c:348
+#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--recompile} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " %s {--freshen -F} ÆÁÊÌ1.rpm ... ÆÁÊÌN.rpm\n"
-#: rpmqv.c:347
-#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#: rpmqv.c:353
+#, fuzzy, c-format
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " %s {--resign} [--rcfile <ÆÁÊÌ>] ÐÁËÅÔ1 ÐÁËÅÔ2 ... ÐÁËÅÔN\n"
-#: rpmqv.c:348
-#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+#: rpmqv.c:354
+#, fuzzy, c-format
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr " %s {--addsign} [--rcfile <ÆÁÊÌ>] ÐÁËÅÔ1 ÐÁËÅÔ2 ... ÐÁËÅÔN"
-#: rpmqv.c:349
-#, c-format
+#: rpmqv.c:355
+#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ÆÁÊÌ>]\n"
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr " ÷ÓÅ ÒÅÖÉÍÙ ÐÏÄÄÅÒÖÉ×ÁÀÔ ÓÌÅÄÕÀÝÉÅ ÁÒÇÕÍÅÎÔÙ:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr " --define '<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'"
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+#, fuzzy
+msgid " --eval '<expr>+' "
msgstr " --eval '<ÉÍÑ>+' "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
+
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr " --pipe <ËÏÍÁÎÄÁ> "
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+#, fuzzy
+msgid " --macros <file:...> "
msgstr " --rcfile <ÆÁÊÌ> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr " --dbpath <ËÁÔÁÌÏÇ> "
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr " --root <ËÁÔÁÌÏÇ> "
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
" õÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ É ÚÁÐÒÏÓ (Ó -p) ÄÏÐÕÓËÁÀÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ftp URL "
"×ÍÅÓÔÏ"
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr " ÉÍÅÎ ÆÁÊÌÏ× Á ÔÁËÖÅ ÓÌÅÄÕÀÝÉÅ ÏÐÃÉÉ:"
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <ÁÄÒÅÓ> "
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr " --ftpport <ÐÏÒÔ> "
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr " --httpproxy <ÁÄÒÅÓ> "
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr " --httpport <ÐÏÒÔ> "
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr " ïÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÁËÅÔÁ:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ×ÓÅ ÐÁËÅÔÙ"
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr " -f <ÆÁÊÌ>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ <ÆÁÊÌ>"
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr " -p <ÆÁÊÌ ÐÁËÅÔÁ>+ "
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ (ÎÅÕÓÔÁÎÏ×ÌÅÎÎÙÊ) ÐÁËÅÔ <ÆÁÊÌ ÐÁËÅÔÁ>"
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr " --triggeredby <ÐÁËÅÔ>"
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÁÍÉ ÎÁ ÐÁËÅÔ <ÐÁËÅÔ>"
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr " --whatprovides <ÓÅÒ×ÉÓ>"
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr " --whatrequires <ÓÅÒ×ÉÓ>"
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr " --queryformat <qfmt>"
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr " ïÐÃÉÉ ×ÙÂÏÒÁ ÉÎÆÏÒÍÁÃÉÉ:"
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr "ÐÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÅ ÐÁËÅÔÏÍ"
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr "ÐÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÐÁËÅÔÁ"
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr "×Ù×ÅÓÔÉ ÒÁÚÎÏÏÂÒÁÚÎÙÅ [ÄÅ]ÉÎÓÔÁÌÌÑÃÉÏÎÎÙÅ ÓËÒÉÐÔÙ"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr "ÐÏËÁÚÁÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÙ, ÓÏÄÅÒÖÁÝÉÅÓÑ × ÐÁËÅÔÅ"
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr " --install <ÆÁÊÌ ÐÁËÅÔÁ>"
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr " -i <ÆÁÊÌ ÐÁËÅÔÁ> "
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr " --excludepath <ÐÕÔØ>"
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ × ÐÕÔÉ <ÐÕÔØ>"
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ËÁËÉÈ-ÌÉÂÏ ÕÓÔÁÎÏ×ÏÞÎÙÈ ÓËÒÉÐÔÏ×"
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÏ×, ×Ú×ÅÄÅÎÎÙÈ ÎÁ ÜÔÏÔ ÐÁËÅÔ"
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr " --prefix <ËÁÔÁÌÏÇ> "
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <oldpath>=<newpath>"
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr " --upgrade <ÆÁÊÌ ÐÁËÅÔÁ>"
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr " -U <ÆÁÊÌ ÐÁËÅÔÁ> "
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr " --erase <ÐÁËÅÔ> "
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr " -b<stage> <spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr " -t<stage> <tarball> "
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr "ÓÏÚÄÁÔØ ÔÏÌØËÏ src rpm"
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr " --buildroot <ËÁÔÁÌÏÇ>"
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr " --target=<ÐÌÁÔÆÏÒÍÁ>+"
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <src_pkg> "
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr " --recompile <src_pkg> "
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr " --resign <ÐÁËÅÔ>+ "
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr " --addsign <pkg>+ "
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr " --checksig <pkg>+"
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr " -K <pkg>+ "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr "ÓÏÚÄÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ (ÎÅ ÏÂÑÚÁÔÅÌØÎÏ)"
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr "ÐÅÒÅÉÎÄÅËÓÉÒÏ×ÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "÷ÍÅÓÔÏ ÎÉÈ ÉÓÐÏÌØÚÕÊÔÅ -e ÉÌÉ --erase.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "ÏÐÃÉÑ --dbpath ÚÁÄÁÎÁ ÄÌÑ ÏÐÅÒÁÃÉÉ, ÎÅ ÉÓÐÏÌØÚÕÀÝÅÊ ÂÁÚÕ ÄÁÎÎÙÈ"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
"ÏÐÃÉÑ --justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÅÒÅÓÂÏÒËÉ"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "ÎÅ ÚÁÄÁÎ spec-ÆÁÊÌ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
@@ -1509,6 +1588,13 @@ msgstr "éÓÐÏÌÎÉÔØ %s ÎÅ ÕÄÁÌÏÓØ (%s): %s"
msgid "Bad exit status from %s (%s)"
msgstr "îÅ×ÅÒÎÙÊ ËÏÄ ×ÏÚ×ÒÁÔÁ ÉÚ %s (%s)"
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ =="
@@ -1728,15 +1814,23 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s"
msgid "Processing files: %s-%s-%s\n"
msgstr "ïÂÒÁÂÁÔÙ×ÁÀÔÓÑ ÆÁÊÌÙ: %s-%s-%s\n"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
-msgstr "RPMERR_INTERNAL: äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ × getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
-msgstr "RPMERR_INTERNAL: äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ × getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr "îÅ ÍÏÇÕ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍÐØÀÔÅÒÁ: %s\n"
@@ -2954,7 +3048,7 @@ msgstr "ÏÔËÒÙÔÉÅ %s ÎÅ ÕÄÁÌÏÓØ\n"
msgid "old format source packages cannot be queried\n"
msgstr "ÚÁÐÒÏÓÙ Ë SRPM × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s ÎÅ ÐÏÈÏÖ ÎÁ ÐÁËÅÔ RPM...\n"
@@ -3018,7 +3112,7 @@ msgstr "ÚÁÐÉÓØ ÐÁËÅÔÁ ÎÏÍÅÒ %d\n"
msgid "record %d could not be read\n"
msgstr "ÚÁÐÉÓØ %d ÎÅ ÞÉÔÁÅÔÓÑ\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
@@ -3297,104 +3391,104 @@ msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr "ÓÞÉÔÁÀ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ\n"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "ÎÁÊÄÅÎÏ %d ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "ÉÝÕ ÐÁËÅÔÙ ÄÌÑ ÐÏÌÕÞÅÎÉÑ Ó ftp/http\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "ÐÒÏÐÕÓËÁÀ %s - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "ðÏÌÕÞÁÀ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "ÐÒÏÐÕÓËÁÀ %s - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "ÐÏÌÕÞÅÎÏ %d ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ÆÁÊÌ %s ÔÒÅÂÕÅÔ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ RPM\n"
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "õÓÔÁÎÁ×ÌÉ×ÁÀ %s\n"
@@ -3677,99 +3771,107 @@ msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ"
msgid "logging into %s as %s, pw %s\n"
msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n"
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== ÁËÔÉ×Î %d ÐÕÓÔ. %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(ÐÕÓÔÏ)"
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(ÐÕÓÔÏ)\n"
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÏÅ ÔÅÌÏ"
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÙÅ ÏÐÃÉÉ"
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÐÕÓÔÏÅ ÔÅÌÏ"
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr "íÁËÒÏÓ %%%s ÒÁÓËÒÙÔØ ÎÅ ÕÄÁÌÏÓØ"
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%undefine)"
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d"
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ %c × %s(%s)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ max(%d)"
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr "îÅÚÁËÒÙÔÁÑ %c: %s"
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr "%% Ó ÐÏÓÌÅÄÕÀÝÉÍ ÎÅÒÁÚÂÉÒÁÅÍÙÍ ÍÁËÒÏÓÏÍ"
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr "íÁËÒÏÓ %s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "æÁÊÌ %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "æÁÊÌ %s ÍÅÎØÛÅ %d ÂÁÊÔ"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
+msgstr "(ÏÛÉÂËÁ 0x%x)"
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "ÏÛÉÂËÁ: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3816,6 +3918,15 @@ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n"
+#~ msgid " --rcfile <file> "
+#~ msgstr " --rcfile <ÆÁÊÌ> "
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#~ msgstr "RPMERR_INTERNAL: äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ × getUname()\n"
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#~ msgstr "RPMERR_INTERNAL: äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ × getGname()\n"
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (ÂÁÇÁ rpm): "
diff --git a/po/sk.po b/po/sk.po
index e80d05990..d8b78a862 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
@@ -24,496 +24,501 @@ msgstr "nevyrie¹ené závislosti:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Nie je mo¾né otvori» spec súbor: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "Otvorenie rúry pre tar zlyhalo: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "Nie je mo¾né preèíta» spec súbor z %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "Nie je mo¾né premenova» %s na %s: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "nepodarilo sa zisti» stav %s: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Súbor nie je obyèajný súbor: %s\n"
-#: build.c:221
+#: build.c:224
#, fuzzy, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr "%s zrejme nie je RPM balík\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, fuzzy, c-format
msgid "Building target platforms: %s\n"
msgstr "predefinova» cieµovú platformu"
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "vyhµadáva sa balík %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzia %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Program mô¾e by» voµne redistribuovaný v súlade s podmienkami GNU GPL"
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "pou¾itie: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <adresár>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root "
"<adresár>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
" [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <súbor>] [--ignorearch] [--dbpath "
"<adresár>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <adresár>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <poèítaè>] [--ftpport <port>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httproxy <poèítaè>] [--httpport <port>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--noorder] [--relocate stará_cesta=nová_cesta]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] súbor1.rpm ... súborN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
" [--oldpackage] [--root <adresár>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <súbor>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <adresár>] [--prefix "
"<adresár>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httproxy <poèítaè>] [--httpport <port>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
" [--noorder] [--relocate stará_cesta=nová_cesta]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " súbor1.rpm ... súborN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <adresár>] [--rcfile <súbor>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
" [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [ciele]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--ftpport <port>] [--provides] [--triggers] "
"[--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
" [--changelog] [--dbpath <adresár>] [targets]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <adresár>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [ciele]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [cieµ]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [cieµ]"
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " súbor1.rpm ... súborN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
"<súbor>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
" [--dbpath <adresár>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] balík1 ... balíkN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <súbor>] balík1 balík2 ... balíkN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <súbor>] balík1 balík2 ... balíkN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
"<súbor>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " balík1 ... balíkN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "pou¾itie:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "vypísa» túto správu"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "vypísa» verziu pou¾ívaného rpm"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " v¹etky re¾imy podporujú nasledovné argumenty:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " --pipe <príkaz> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "vypísa» verziu pou¾ívaného rpm"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <príkaz> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "posla» ¹tandardný výstup do <príkazu>"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " --rcfile <file> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "pou¾i» <súbor> namiesto /etc/rpmrc a $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "o nieèo popisnej¹í re¾im"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "veµmi popisný re¾im (pre odlaïovanie)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr " in¹talácia, aktualizácia a otázky (s -p) umo¾òujú pou¾i» ftp URL"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " namiesto názvov súborov, ako aj nasledujúce voµby:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <poèítaè>"
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "názov poèítaèa alebo IP adresa ftp proxy"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "èíslo portu ftp servera (alebo proxy)"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --httpproxy <poèítaè>"
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "názov poèítaèa alebo IP adresa http proxy"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "èíslo portu http servera (alebo proxy)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "re¾im otázok"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <dir> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "pou¾i» <adresár> ako adresár pre databázu"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <qfmt>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "pou¾i» <qfmt> ako hlavièkový formát (implikuje -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <dir> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Voµby pre ¹pecifikáciu balíkov"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "opýta» sa na v¹etky balíky"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <súbor>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "opýta» sa na balík vlastniaci <súbor>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <súbor_balíku>+"
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "opýta» sa (nenain¹talovaného) balíku <súbor_balíku>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <balík>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "opýta» sa na balíky spustené balíkom <balík>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <schopnos»>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "opýta» sa na balíky poskytujúce schopnos» <schopnos»>"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr " --whatrequires <schopnos»>"
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr "opýta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Voµby pre výber po¾adovanej informácie:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "zobrazi» informácie o balíku"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "zobrazi» históriu zmien balíka"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "zobrazi» zoznam súborov balíka"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "zobrazi» stavy súborov (implikuje -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "zobrazi» len súbory obsahujúce dokumentáciu (implikuje -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "zobrazi» iba konfiguraèné súbory (implikuje -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -521,23 +526,23 @@ msgstr ""
"zobrazi» v¹etky overiteµné údaje pre ka¾dý súbor (musí by» pou¾ité s -l, -c "
"alebo -d)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "zobrazi» schopnosti poskytované balíkom"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "zobrazi» závislosti balíka"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "vypísa» rôzne [od]in¹talaèné skripty"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr "zobrazi» spú¹»acie skripty obsiahnuté v balíku"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
@@ -545,142 +550,142 @@ msgstr ""
"overi» in¹taláciu balíka s pou¾itím rovnakých volieb ¹pecifikácia balíka ako "
"pre -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "neoverova» závislosti balíka"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "neoverova» md5 kontrolné súèty súborov"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "neoverova» atribúty súborov"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "vypísa» príznaky, ktoré mô¾u by» pou¾ité vo formáte otázky"
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <súbor_balíku>"
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <súbor_balíku> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "in¹talova» balík"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <cesta>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr "vynecha» súbory v ceste <cesta>"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <stará_cesta>=<nová_cesta>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "presunú» súbory zo <starej_cesty> do <novej_cesty>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "balík %s nie je nain¹talovaný\n"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <adresár> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "presunú» balík do <adresára>, pokiaµ to balík povoµuje"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "nein¹talova» dokumentáciu"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skratka pre --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "vypisova» znaèky poèas in¹talácie balíka (vhodné s -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"in¹talova» v¹etky súbory vrátane konfiguraèných súborov, ktoré by inak mohli "
"by» vynechané"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "neoverova» architektúru balíka"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "pred in¹taláciou nekontrolova» dostupné miesto na disku"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "neoverova» operaèný systém balíka"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "in¹talova» dokumentáciu"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "aktualizova» databázu bez zmeny súborového systému"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr "nemeni» poradie balíkov kvôli vyrie¹eniu závislostí"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "vypisova» percentá poèas in¹talácie balíka"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "in¹talova» aj pokiaµ balík prepí¹e in¹talované súbory"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "prein¹talova», pokiaµ u¾ balík existuje"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr " --upgrade <súbor_balíka>"
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr " -U <súbor_balíka> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "aktualizova» balík (rovnaké voµby ako --install, a k tomu)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -688,15 +693,15 @@ msgstr ""
"aktualizova» na star¹iu verziu balíka (--force to pri aktualizácii urobí "
"automaticky)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr " --erase <package>"
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "odin¹talova» balík"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -704,102 +709,102 @@ msgstr ""
"odin¹talova» v¹etky balíky urèené <balíkom> (inak je chybou, pokiaµ <balík> "
"¹pecifikuje viac ako jeden balík)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<etapa> <spec> "
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr " -t<etapa> <tar_súbor> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "zostavi» balík, kde <etapa> je jedna z:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "príprava (rozbali» zdrojové súbory a aplikova» záplaty)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "kontrola zoznamu (vykona» niektoré zbe¾né kontroly sekcie %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompilácia (príprava a kompilácia)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "in¹talácia (príprava, kompilácia, in¹talácia)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "binárny balík (príprava, kompilácia, in¹talácia, zabalenie)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "binárny a zdrojový balík (príprava, kompilácia, in¹talácia, zabalenie)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "preskoèi» priamo k urèenej etape (iba pre c, i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "po ukonèení odstráni» adresár, v ktorom sa balík zostavoval"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr "vytvori» PGP/GPG podpis"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr " --buildroot <adresár> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "pou¾i» <adresár> pre zostavenie balíka"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr " --target=<platforma>+"
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr "vytvori» balíky pre ciele platforma1...platformaN."
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "nevykona» ¾iadne etapy"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr " --timecheck <sekúnd>"
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "nastavi» kontrolu èasu na <sekúnd> sekúnd (0 pre deaktiváciu)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <zdroj_balík>"
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -807,65 +812,65 @@ msgstr ""
"in¹talova» zdrojový balík, vytvori» binárny balík a odstráni» spec-súbor, "
"zdroje, záplaty a ikony"
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr " --recompile <src_pkg> "
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "ako --rebuild, ale nezostavi» ¾iadny balík"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr " --resign <balík>+ "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "podpísa» balík (znièi» aktuálny podpis)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr " --addsign <balík>+ "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "prida» podpis balíku"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <balík>+ "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <balík>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "overi» podpis balíka"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "vynecha» akékoµvek PGP podpisy"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr "vynecha» akékoµvek GPG podpisy"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "vynecha» akékoµvek MD5 podpisy"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "uisti» sa, ¾e existuje platná databáza"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "znovu vytvori» databázu z existujúcej"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -873,7 +878,7 @@ msgstr ""
"nastavi» prístupové práva súborov podµa údajov v databáze balíkov s pou¾itím "
"rovnakých volieb ¹pecifikácia balíka ako pre -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -881,141 +886,149 @@ msgstr ""
"nastavi» vlastníka a skupinu súborov podµa údajov v databáze balíkov s "
"pou¾itím rovnakých volieb ¹pecifikácia balíka ako pre -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "mô¾e by» pou¾itý iba jeden hlavný re¾im"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u a --uninstall sú zastaralé a u¾ nefungujú.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "presunutia musia zaèína» znakom /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "presunutia musia obsahova» znak ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "presunutia musia ma» za znakom = znak /"
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musia zaèína» znakom /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "naraz mô¾e by» vykonaný jeden typ otázky alebo overenia"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "neoèakávaný zdroj pre otázku"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "neoèakávaný zdroj pre otázku"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "neoèakávaný zdroj pre otázku"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "iba in¹talácia, aktualizácia a odstránenie zdrojov mô¾u by» vynútené"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "súbory mô¾u by» presunuté iba poèas inètalácie balíka"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "mo¾e by» pou¾itá iba jedna z volieb --prefix a --relocate"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate a --excludepath mô¾u by» pou¾ité iba poèas in¹talácie nových "
"balíkov"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix mô¾e by» pou¾itý iba poèas in¹talácie nových balíkov"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty pre --prefix musia zaèína» znakom /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mô¾e by» pou¾itý iba poèas in¹talácie balíka"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "mô¾e by» pou¾itá iba jedna voµba z --excludedocs a --includedocs"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mô¾e by» pou¾ité iba poèas odstránenia balíkov"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -1023,7 +1036,7 @@ msgstr ""
"--noscripts mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo "
"overenia balíka"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
@@ -1031,7 +1044,7 @@ msgstr ""
"--notriggers mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo "
"overenia balíka"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1040,7 +1053,7 @@ msgstr ""
"--nodeps mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo overenia "
"balíka"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -1048,7 +1061,7 @@ msgstr ""
"--test mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo zostavenia "
"balíka"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1056,98 +1069,98 @@ msgstr ""
"--root (-r) mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka, "
"otázky alebo znovuzostavenia databázy"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty pre --root (-r) musia zaèína» znakom /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage mô¾e by» pou¾íté iba poèas aktualizácie"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp mô¾e by» pou¾íté iba poèas overenia podpisu"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg mô¾e by» pou¾íté iba poèas overenia podpisu"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 mô¾e by» pou¾íté iba poèas overenia podpisu alebo balíka"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr "nie je mo¾né pracova» so súborom %s\n"
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr "pgp nebolo nájdené: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Kontrola hesla zlyhala\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Heslo je v poriadku.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "neoèakávané argumenty pre --querytags"
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "neboli zadané ¾iadne balíky pre overenie podpisu"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "neboli zadané ¾iadne balíky na podpis"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "neboli zadané ¾iadne balíky pre odin¹talovanie"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "neboli zadané ¾iadne argumenty pre overenie"
@@ -1169,404 +1182,468 @@ msgstr "chyba pri èítaní hlavièky balíka\n"
msgid "cannot re-open payload: %s\n"
msgstr "nie je mo¾né otvori» súbor %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "vypísa» verziu pou¾ívaného rpm"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "pou¾itie: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " rpm {--initdb} [--dbpath <adresár>]"
-#: rpmqv.c:289
+#: rpmqv.c:295
#, fuzzy, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, fuzzy, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <súbor>] [--ignorearch] [--dbpath "
+"<adresár>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <súbor>]"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
"<súbor>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <adresár>] [--rcfile <súbor>]"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, fuzzy, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " rpm {--setperms} [-afpg] [cieµ]"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, fuzzy, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " rpm {--setugids} [-afpg] [cieµ]"
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
"<súbor>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=platform1[,platform2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] specsúbor"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " rpm {--rmsource} [--rcfile <súbor>] [-v] specsúbor"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--rebuild} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--recompile} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " súbor1.rpm ... súborN.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " rpm {--resign} [--rcfile <súbor>] balík1 balík2 ... balíkN"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <súbor>] balík1 balík2 ... balíkN"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
"<súbor>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " v¹etky re¾imy podporujú nasledovné argumenty:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " --pipe <príkaz> "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "vypísa» verziu pou¾ívaného rpm"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " --pipe <príkaz> "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " --rcfile <file> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " --dbpath <dir> "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " --root <dir> "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr " in¹talácia, aktualizácia a otázky (s -p) umo¾òujú pou¾i» ftp URL"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " namiesto názvov súborov, ako aj nasledujúce voµby:"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <poèítaè>"
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --httpproxy <poèítaè>"
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Voµby pre ¹pecifikáciu balíkov"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "opýta» sa na v¹etky balíky"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -f <súbor>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "opýta» sa na balík vlastniaci <súbor>"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -p <súbor_balíku>+"
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "opýta» sa (nenain¹talovaného) balíku <súbor_balíku>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr " --triggeredby <balík>"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "opýta» sa na balíky spustené balíkom <balík>"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr " --whatprovides <schopnos»>"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "opýta» sa na balíky poskytujúce schopnos» <schopnos»>"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr " --whatrequires <schopnos»>"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "opýta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
-#: rpmqv.c:447
+#: rpmqv.c:453
#, fuzzy
msgid " --queryformat <qfmt> "
msgstr " --queryformat <qfmt>"
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Voµby pre výber po¾adovanej informácie:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "zobrazi» schopnosti poskytované balíkom"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "zobrazi» schopnosti poskytované balíkom"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "vypísa» rôzne [od]in¹talaèné skripty"
-#: rpmqv.c:472
+#: rpmqv.c:478
#, fuzzy
msgid "show the trigger scriptlets contained in the package"
msgstr "zobrazi» spú¹»acie skripty obsiahnuté v balíku"
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr " --install <súbor_balíku>"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -i <súbor_balíku> "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr " --excludepath <cesta>"
-#: rpmqv.c:507
+#: rpmqv.c:513
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "vynecha» súbory v ceste <cesta>"
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " --prefix <adresár> "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <stará_cesta>=<nová_cesta>"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr " --upgrade <súbor_balíka>"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -U <súbor_balíka> "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr " --erase <package>"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<etapa> <spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -t<etapa> <tar_súbor> "
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "balík nemá meno"
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " --buildroot <adresár> "
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " --target=<platforma>+"
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <zdroj_balík>"
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " --recompile <src_pkg> "
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " --resign <balík>+ "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " --addsign <balík>+ "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <balík>+ "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <balík>+ "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "znovu vytvori» databázu z existujúcej"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadané pre operáciu nepou¾ívajúcu databázu"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
@@ -1590,6 +1667,13 @@ msgstr "Vykonanie %s zlyhalo (%s)"
msgid "Bad exit status from %s (%s)"
msgstr "Chybný výstupný kód z %s (%s)"
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
#, fuzzy
msgid "syntax error while parsing =="
@@ -1814,15 +1898,23 @@ msgstr "Nepodarilo sa zisti» poskytované vlastnosti"
msgid "Processing files: %s-%s-%s\n"
msgstr "Spracovávajú sa súbory: %s\n"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
-msgstr "RPMERR_INTERNAL: Dosiahnutý limit v getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
-msgstr "RPMERR_INTERNAL: Dosiahnutý limit v getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n"
@@ -3058,7 +3150,7 @@ msgstr "otvorenie %s zlyhalo\n"
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:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s zrejme nie je RPM balík\n"
@@ -3123,7 +3215,7 @@ msgstr "po¾aduje sa záznam èíslo %d\n"
msgid "record %d could not be read\n"
msgstr "záznam %d nie je mo¾né preèíta»\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nain¹talovaný\n"
@@ -3404,104 +3496,104 @@ msgstr "vytvára sa adresár %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr "poèítajú sa balíky pre in¹taláciu\n"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "nájdených %d balíkov\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "hµadajú sa balíky, ktoré treba prenies»\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Prená¹a sa %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "prenieslo sa %d balíkov\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je mo¾né otvori» súbor %s: %s"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je mo¾né nain¹talova»\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "nevyrie¹ené závislosti:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "in¹talujú sa binárne balíky\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je mo¾né otvori» %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "In¹taluje sa %s\n"
@@ -3788,99 +3880,107 @@ msgstr "Neznáma alebo neoèakávaná chyba"
msgid "logging into %s as %s, pw %s\n"
msgstr "prihlasuje sa na %s ako %s, heslo %s\n"
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktívnych %d prázdnych %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(prázdne)"
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(prázdne)\n"
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr "Makro %%%s obsahuje neukonèené telo"
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "Makro %%%s obsahuje chybný názov (%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr "Makro %%%s obsahuje neukonèené voµby"
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr "Makro %%%s obsahuje prázdne telo"
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr "Makro %%%s sa nepodarilo expandova»"
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr "Makro %%%s obsahuje chybný názov (%%undefine)"
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d "
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "Neznáma voµba %c v %s(%s)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)"
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr "Neukonèené %c: %s"
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr "balík %%%.*s nebol nájdený, vynecháva sa"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "Preplnenie cieµovej vyrovnávacej pamäti"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "Súbor %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "Súbor %s je men¹í ako %d bajtov"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "varovanie: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
+msgstr "(chyba 0x%x)"
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "fatálna chyba: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "chyba: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "fatálna chyba: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "varovanie: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3927,6 +4027,16 @@ msgstr "nepodarilo sa otvori» %s: %s"
msgid "failed to create %s: %s\n"
msgstr "nepodarilo sa vytvori» %s\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " --rcfile <file> "
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#~ msgstr "RPMERR_INTERNAL: Dosiahnutý limit v getUname()\n"
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#~ msgstr "RPMERR_INTERNAL: Dosiahnutý limit v getGname()\n"
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "interná chyba (chyba rpm?): "
diff --git a/po/sl.po b/po/sl.po
index 81b9c99e9..70b3c8373 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.97 2000/08/31 02:39:00 jbj Exp $
+# $Id: sl.po,v 1.98 2000/09/01 21:15:43 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-02-17 22:25+01:00\n"
"Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "datoteke %s/packages.rpm ni mo¾no odpreti\n"
@@ -28,488 +28,493 @@ msgstr "izdelava soodvisnosti neuspe¹na:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Datoteke spec %s ni mo¾no odpreti: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "Povezava s programom tar neuspe¹na: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "Neuspe¹no branje datoteke spec iz %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "Neuspe¹no preimenovanje %s v %s: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "status %s ni na voljo: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Datoteka ni obièajna datoteka: %s\n"
-#: build.c:221
-#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+#: build.c:224
+#, fuzzy, c-format
+msgid "File %s does not appear to be a specfile."
msgstr "Ne ka¾e, da je %s datoteka spec.\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Izgradnja za ciljna strojna okolja: %s\n"
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr "Izgradnja za ciljni sistem %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM razlièica %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Dovoljeno je razmno¾evanje in raz¹irjanje pod pogoji, navedenimi v GNU GPL."
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "uporaba: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <imenik>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <imenik>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <datoteka>] [--ignorearch] [--dbpath "
"<imenik>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <imenik>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <raè.>] [--ftpport <vrata>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <raè.>] [--httpport <vrata>] "
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate stara_pot=nova_pot]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <pot>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <imenik>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <imenik>] [--prefix "
"<imenik>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httpproxy <raè.>] [--httpport <vrata>] "
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate stara_pot=nova_pot]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <pot>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [targets]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--ftpport <vrata>] [--provides] [--triggers] "
"[--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <imenik>] [targets]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <imenik>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [targets]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [target]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [target]"
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " rpm {--freshen -F} datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e} [--root <imenik>] [--noscripts] [--rcfile <datoteka>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <imenik>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] paket1 ... paketN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
"<datoteka>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " paket1 ... paket2"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "uporaba:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "to sporoèilo"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "uporabljana razlièica rpm"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " vsi naèini podpirajo naslednje argumente:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " --pipe <ukaz> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "uporabljana razlièica rpm"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <ukaz> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "standardni izhod preusmerimo na <ukaz>"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " --rcfile <datoteka> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "uporabite <datoteka> namesto /etc/rpmrc in $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "z nekaj veè komentarja med potekom"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "z vsem komentarjem (za odpravo napak)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" namestitev, obnova in poizvedba (z -p) omogoèata, da namesto imen datotek"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " navedemo URL za FTP; poleg tega pa ¹e naslednje mo¾nosti:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <raè.> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "ime raèunalnika ali IP za zastopnika FTP"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <vrata> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "¹tevilka vrat za FTP na stre¾niku ali zastopniku"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --httpproxy <raè.> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "ime raèunalnika ali IP za zastopnika HTTP"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " --httpport <vrata> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "¹tevilka vrat za HTTP na stre¾niku ali zastopniku"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "poizvedbeni naèin"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <imenik> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "i¹èi podatkovno zbirko v <imeniku>"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <qfmt>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "uporabi <qfmt> kot obliko glave (implicira -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <imenik> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za vrhnji imenik"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Mo¾nosti za doloèitev paketov:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "poizvedba po vseh paketih"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <datoteka>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <paket>+ "
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "poizvedba po (¾e name¹èenem) <paketu>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <pkg>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "poizvedba po paketih, ki jih spro¾i paket <pkg>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <mo¾>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "poizvedba po paketih, ki ponujajo dano <mo¾>nost"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr " --whatrequires <mo¾>"
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr "poizvedba po paketih, ki potrebujejo dano <mo¾>nost"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Izbire izbora informacij:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "izpis informacij o paketu"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "izpis dnevnika sprememb paketa"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "izpis seznama datotek v paketu"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "prikaz statusa datotek (privzema -i)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "seznam datotek z dokumetacijo (privzema -i)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "seznam nastavitvenih datotek (privzema -i)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -517,164 +522,164 @@ msgstr ""
"prikaz vseh preverljivih informacij o vsaki datoteki (le skupaj z -l, -c ali "
"-d)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "izpis mo¾nosti, ki jih nudi paket"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "izpis odvisnosti paketa"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "izpis razliènih (od)namestitvenih skriptov"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr "prikaz pro¾ilnih skriptov, ki jih paket vsebuje"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr "namestitev paketa preverimo z enakimi izbirnimi doloèili kot -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "brez preverjanja soodvisnosti paketa"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "brez preverjanja nadzorne vsote md5"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "brez preverjanja prilastkov datotek"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "izpi¹i znaèke, ki pridejo v po¹tev pri poizvedbi"
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <paket> "
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <paket> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "namestimo paket"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <pot> "
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr "preskoèimo datoteke v navedeni poti"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <starapot>=<novapot>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "datoteke iz stare poti prestavimo v novo"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "poti %s ni mo¾no premakniti za paket %s-%s-%s"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <imenik> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "èe je dovoljeno, paket prestavimo v <imenik>"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "brez namestitve dokumentacije"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "okraj¹ava za --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"namestitev vseh datotek, vkljuèno z nastavitvenimi, ki so sicer izpu¹èene"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "brez preverjanja arhitekture paketa"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "brez preverjanja prostora na disku pred name¹èanjem"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "brez preverjanja operacijskega sistema paketa"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "namesti dokumentacijo"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "obnovi podatkovno zbirko, a ne spreminjaj datoteènega sistema"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "brez izvajanja namestitvenih skriptov"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "z izpisom procentov med namestitvijo"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èenih datotek"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "ponovno namesti, èe paket ¾e obstaja"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "ne namesti, a ugotovi, èe bi delovalo"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr " --upgrade <paket> "
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr " -U <paket> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "nadgradi paket (iste izbire kot --install in ¹e:)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -682,15 +687,15 @@ msgstr ""
"nadgraditev na starej¹o razlièico paketa (--force pri nadgradnjah "
"avtomatièno vkljuèi to izbiro)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr " --erase <paket> "
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "zbri¹i (odstrani) paket"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -698,103 +703,103 @@ msgstr ""
"odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer izidemo z izidom o "
"napaki, èe <paket> doloèa veè paketov)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "brez izvajanja katerihkoli skriptov paketa"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<stopnja> <spec> "
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr " -t<stopnja> <arhiv tar>"
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "zgradi paket do navedene stopnje, ki je ena od:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "priprava (razpakiraj izvorno kodo in uporabi krparije)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "preverjanje (povr¹no preverjanje %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "prevod (priprava in prevajanje)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "namestitev (pripava, prevajanje, namestitev)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "prevedeni paket (priprava, prevajanje, namestitev, izgradnja paketa)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
"prevedeni in izvorni paket (priprava, prevajanje, namestitev, izgradnja "
"paketa)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "preskoèimo naravnost na doloèeno stopnjo (samo za c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "po zakljuèku odstranimo delovni imenik"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr "po zakljuèku odstranimo izvorno kodo"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "po zakljuèku odstranimo datoteko spec"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr "izdelava podpisa PGP/GPG"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr " --buildroot <imenik>"
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "<imenik> naj bo korenski imenik pri izgradnji"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr " --target=<s.okolje>+"
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr "izgradi pakete za navedena ciljna strojna okolja"
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr " --timecheck <sek> "
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "najveèji dopustni èas izgradnje paketa (0 brez omejitev)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <izv.paket> "
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -802,65 +807,65 @@ msgstr ""
"Namesti izvorni paket, izgradi prevedeni paket in pobri¹i datoteko spec, "
"izvorno kodo, krpe in ikone."
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr " --recompile <izv.pak.>"
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "kot --rebuild, a brez izgradnje kakr¹negakoli paketa"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr " --resign <paket>+ "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "podpi¹i paket(e) (trenutni podpis zavr¾emo)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr " --addsign <paket>+ "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "dodaj podpis k paketu(-om)"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <paket>+ "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <paket>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "preveri podpis paketa(-ov)"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "preskoèi vse podpise PGP"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr "preskoèi vse podpise GPG"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "preskoèi vse podpise MD5"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "preveri, èe obstaja veljavna zbirka"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "ponovno izgradi zbirko iz obstojeèe"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -868,7 +873,7 @@ msgstr ""
"dovoljenja za datoteke postavimo na vrednosti v paketu, z istimi izbirnimi "
"doloèilili kot pri -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -876,137 +881,145 @@ msgstr ""
"lastnika in skupino datoteke postavimo na vrednosti v paketu, z istimi "
"izbirnimi doloèili kot pri -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "samo en glavni naèin sme biti izbran"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u in --uninstall nista veè podprti izbiri in ne delujeta veè.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Namesto njiju uporabite -e ali --erase.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "prestavitve se morajo zaèeti z /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "prestavitve morajo vsebovati ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "prestavitve morajo imeti /, ki sledi ="
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr "poti, ki jih preskoèimo, se morajo zaèeti z /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interna napake pri obdelavi argumentov (%d)\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "samo en tip poizvedbe/preverjanja naenkrat je mo¾en"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr "neprièakovane zastavice pri poizvedbi"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr "neprièakovana oblika poizvedbe"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "neprièakovan izvor poizvedbe"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "datoteke lahko prestavimo samo pri namestitvi paketa"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "izbiri --prefix in --relocate se izkljuèujeta"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "izbiri --relocate in --excludepath lahko uporabimo samo pri namestitvi"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix smemo uporabiti samo pri namestitvi"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti izbire --prefix se morajo zaèeti z /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) smemo podati samo ob namestitvi paketa"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent smemo podati samo ob namestitvi paketa"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles smemo podati samo ob namestitvi paketa"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs smemo podati samo ob namestitvi paketa"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs smemo podati samo ob namestitvi paketa"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs smemo podati samo ob namestitvi paketa"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "izbiri --excludedocs in --includedocs se izkljuèujeta"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch smemo podati samo ob namestitvi paketa"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos smemo podati samo ob namestitvi paketa"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize smemo podati samo ob namestitvi paketa"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches smemo podati samo ob odstranitvi paketa"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles smemo podati samo ob namestitvi paketa"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb smemo podati samo ob namestitvi ali odstranitvi paketa"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -1014,7 +1027,7 @@ msgstr ""
"--noscripts smemo podati samo ob namestitvi, odstranitvi ali preverjanju "
"paketa"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
@@ -1022,7 +1035,7 @@ msgstr ""
"--notriggers smemo podati samo ob namestitvi, odstranitvi ali preverjanju "
"paketa"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -1030,14 +1043,14 @@ msgstr ""
"--nodeps smemo podati samo ob izgradnji, vnovièni izgradnji, prevajanju, "
"namestitvi, odstranitvi ali preverjanju paketa"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test smemo podati samo ob namestitvi, odstranitvi ali izgradnji paketa"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1045,97 +1058,97 @@ msgstr ""
"--root (-r) smemo podati samo ob namestitvi, odstranitvi poizvedbi ali "
"vnovièni izgradnji paketa"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti izbire --root (-r) se morajo zaèeti z /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage smemo podati samo ob nadgradnji"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp smemo podati samo ob preverjanju podpisa"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg smemo podati samo ob preverjanju podpisa"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 smemo podati samo ob preverjanju podpisa ali paketa"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr "datoteka za podpis manjka\n"
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr "dostop do datoteke %s ni mo¾en\n"
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr "pgp manjka: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr "Vnesite pristopno geslo: "
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Preverjanje pristopnega gesla neuspe¹no\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Pristopno geslo je pravo.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Neveljaven %%_signature v makrodatoteki.\n"
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign smemo podati samo ob izgradnji paketa"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr "exec neuspe¹en\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "neprièakovani argumenti za --querytags "
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "paketi za preverjanje podpisa niso navedeni"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "paketi za podpisovanje niso navedeni"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "paketi za odstranitev niso navedeni"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "paketi za namestitev niso navedeni"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "pri poizvedbi paketov so podani odveèni argumenti"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr "pri preverjanju paketov so podani odveèni argumenti"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
@@ -1157,403 +1170,467 @@ msgstr "napaka pri branju glave paketa\n"
msgid "cannot re-open payload: %s\n"
msgstr "ni mo¾no vnoviè odpreti (payload): %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "uporabljana razlièica rpm"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "uporaba: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " rpm {--initdb} [--dbpath <imenik>]"
-#: rpmqv.c:289
+#: rpmqv.c:295
#, fuzzy, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " rpm {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, fuzzy, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <datoteka>] [--ignorearch] [--dbpath "
+"<imenik>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" rpm {--erase -e} [--root <imenik>] [--noscripts] [--rcfile <datoteka>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, fuzzy, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " rpm {--setperms} [-afpg] [target]"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, fuzzy, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " rpm {--setugids} [-afpg] [target]"
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
"<datoteka>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=okolje1[,okolje2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] [--rmspec] datoteka_spec"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " rpm {--rmsource} [--rcfile <datoteka>] [-v] datoteka_spec"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--rebuild} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--recompile} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " rpm {--freshen -F} datoteka1.rpm ... datotekaN.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " rpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
"<datoteka>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " vsi naèini podpirajo naslednje argumente:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " --pipe <ukaz> "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "uporabljana razlièica rpm"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " --pipe <ukaz> "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " --rcfile <datoteka> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " --dbpath <imenik> "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " --root <imenik> "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
" namestitev, obnova in poizvedba (z -p) omogoèata, da namesto imen datotek"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " navedemo URL za FTP; poleg tega pa ¹e naslednje mo¾nosti:"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <raè.> "
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " --ftpport <vrata> "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " --httpproxy <raè.> "
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " --httpport <vrata> "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Mo¾nosti za doloèitev paketov:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "poizvedba po vseh paketih"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -f <datoteka>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -p <paket>+ "
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "poizvedba po (¾e name¹èenem) <paketu>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr " --triggeredby <pkg>"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "poizvedba po paketih, ki jih spro¾i paket <pkg>"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr " --whatprovides <mo¾>"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "poizvedba po paketih, ki ponujajo dano <mo¾>nost"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr " --whatrequires <mo¾>"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "poizvedba po paketih, ki potrebujejo dano <mo¾>nost"
-#: rpmqv.c:447
+#: rpmqv.c:453
#, fuzzy
msgid " --queryformat <qfmt> "
msgstr " --queryformat <qfmt>"
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Izbire izbora informacij:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "izpis mo¾nosti, ki jih nudi paket"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "izpis mo¾nosti, ki jih nudi paket"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "izpis razliènih (od)namestitvenih skriptov"
-#: rpmqv.c:472
+#: rpmqv.c:478
#, fuzzy
msgid "show the trigger scriptlets contained in the package"
msgstr "prikaz pro¾ilnih skriptov, ki jih paket vsebuje"
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr " --install <paket> "
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -i <paket> "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr " --excludepath <pot> "
-#: rpmqv.c:507
+#: rpmqv.c:513
#, fuzzy
msgid "skip files with leading component <path> "
msgstr "preskoèimo datoteke v navedeni poti"
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "brez izvajanja namestitvenih skriptov"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " --prefix <imenik> "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <starapot>=<novapot>"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr " --upgrade <paket> "
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -U <paket> "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr " --erase <paket> "
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<stopnja> <spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -t<stopnja> <arhiv tar>"
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "paket nima imena"
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " --buildroot <imenik>"
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " --target=<s.okolje>+"
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <izv.paket> "
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " --recompile <izv.pak.>"
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " --resign <paket>+ "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " --addsign <paket>+ "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " --checksig <paket>+ "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " --resign <paket>+ "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "ponovno izgradi zbirko iz obstojeèe"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Namesto njiju uporabite -e ali --erase.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "podani --dbpath ne uporablja podatkovne zbirke"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr "--justdb smemo podati samo ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "paketi za vnovièno izgradnjo niso navedeni"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
@@ -1577,6 +1654,13 @@ msgstr "Izvajanje %s neuspe¹no (%s): %s"
msgid "Bad exit status from %s (%s)"
msgstr "%s javi neuspe¹no izhodno kodo (%s)"
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr "napaka v skladnji pri razèlembi =="
@@ -1796,15 +1880,23 @@ msgstr "Neuspe¹no iskanje %s:"
msgid "Processing files: %s-%s-%s\n"
msgstr "Obdelujemo datoteke: %s-%s-%s\n"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
-msgstr "RPMERR_INTERNAL: Dose¾ena omejitev v getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
-msgstr "RPMERR_INTERNAL: Dose¾ena omejitev v getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr "Iskanje kanoniènega imena gostitelja neuspe¹no: %s\n"
@@ -3045,7 +3137,7 @@ msgstr "odpiranje %s neuspe¹no: %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s najverjetneje ni paket RPM\n"
@@ -3110,7 +3202,7 @@ msgstr "¹tevilka zapisa paketa: %d\n"
msgid "record %d could not be read\n"
msgstr "zapisa %d ni mo¾no prebrati\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni name¹èen\n"
@@ -3389,104 +3481,104 @@ msgstr "ustvarjamo imenik: %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "neuspe¹na odstranitev imenika %s: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr "¹tetje paketov za namestitev\n"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "najdeno %d paketov\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "iskanje paketov za prenos po omre¾ju\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "preskakujemo %s - rpmGlob neuspe¹en(%d)\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Prena¹amo %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskakujemo %s - prenos neuspe¹en - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "prenesli smo %d paketov\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni mo¾no odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni mo¾no namestiti\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "paketa ni mo¾no odpreti: %s\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni mo¾no prestaviti\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "datoteka %s zahteva novej¹o razlièico RPM\n"
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "neuspe¹ne soodvisnosti:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "name¹èamo binarne pakete\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" doloèa veèterne pakete\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni mo¾no odpreti %s: %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Name¹èamo %s\n"
@@ -3768,99 +3860,107 @@ msgstr "Neznana ali neprièakovana napaka"
msgid "logging into %s as %s, pw %s\n"
msgstr "prijava na %s kot %s, geslo %s\n"
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktivni %d prazni %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(prazni)"
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(prazni)\n"
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr "Makro %%%s vsebuje nezakljuèeno telo"
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr "Makro %%%s vsebuje nezakljuèene izbire"
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr "Makro %%%s vsebuje prazno telo"
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr "Makro %%%s se ne raz¹iri"
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)"
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d"
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "Neznana izbira %c v %s(%s)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)"
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr "Nezakljuèeni %c: %s"
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr "Oznaki %% sledi nerazèlenljiv makro"
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr "Makro %%%.*s ni najden, preskoèimo"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "Ciljni medpomnilnik prekoraèen"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "Datoteka %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "Datoteka %s je kraj¹a od %d bajtov"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "opozorilo: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
+msgstr "(napaka 0x%x)"
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "usodna napaka: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "napaka: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "usodna napaka: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "opozorilo: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3907,6 +4007,16 @@ msgstr "neuspe¹no odpiranje %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "neuspe¹no ustvarjanje %s: %s\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " --rcfile <datoteka> "
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#~ msgstr "RPMERR_INTERNAL: Dose¾ena omejitev v getUname()\n"
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#~ msgstr "RPMERR_INTERNAL: Dose¾ena omejitev v getGname()\n"
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "interna napaka (hro¹è v rpm?): "
diff --git a/po/sr.po b/po/sr.po
index 53ad0330e..c028fc2f1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,13 +1,13 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
"From: Erik Troan <ewt@lacrosse.redhat.com>\n"
"Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
"--keyword=N_\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
@@ -22,484 +22,489 @@ msgstr "lo¹e meðuzavisnosti:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Ne mogu da otvorim %s za èitanje: %s"
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, fuzzy, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr "neuspelo otvaranje %s\n"
#. Give up
-#: build.c:147
+#: build.c:145
#, fuzzy, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr "Neuspelo èitanje %s: %s."
-#: build.c:174
+#: build.c:172
#, fuzzy, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr "Neuspelo èitanje %s: %s."
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
-msgstr ""
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "neuspelo otvaranje %s: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
+msgstr "%s ne lièi na RPM paket\n"
-#: build.c:221
+#: build.c:224
#, fuzzy, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr "%s ne lièi na RPM paket\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "gre¹ka potrage za paketom %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzija %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU GPL"
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "kori¹æenje: {rpm --help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr "\t\t\t paket1 ...paketN"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
#, fuzzy
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
#, fuzzy
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr "\t\t\t paket1 ...paketN"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
#, fuzzy
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr "\t\t\t paket1 ...paketN"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
#, fuzzy
msgid " file1.rpm ... fileN.rpm"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr "\t\t\t paket1 ...paketN"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
#, fuzzy
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr "\t\t\t paket1 ...paketN"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr "\t\t\t paket1 ...paketN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr "\trpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpm.c:244
+#: rpm.c:246
#, fuzzy
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr "\t\t\t paket1 ...paketN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "kori¹æenje:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "¹tampaj ovu poruku"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "napi¹i verziju rpm-a koja se koristi"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " svi re¾imi podr¾avaju sledeæe argumente:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "napi¹i verziju rpm-a koja se koristi"
-#: rpm.c:293
+#: rpm.c:295
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "po¹alji standardni izlaz u <komandu>"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "koristi <datoteku> umesto /etc/rpmrc i $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "budi malko prièljiviji"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "budi neverovatno prièljiv (zbog nala¾enja gre¹aka)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-ova"
-#: rpm.c:306
+#: rpm.c:308
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " na mestu imena datoteka kao i sledeæe opcije:\n"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "ime hosta ili IP ftp proxy-ja"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "broj porta FTP servera (ili proxy)"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
#, fuzzy
msgid "hostname or IP of http proxy"
msgstr "ime hosta ili IP ftp proxy-ja"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
#, fuzzy
msgid "port number of http server (or proxy)"
msgstr "broj porta FTP servera (ili proxy)"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "re¾im upita"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "koristi <dir> kao direktorijum baze podataka"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "koristi s kao format zaglavlja (povlaèi -i)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Opcije odrednice paketa:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "upit nad svim paketima"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "upit za (deinstaliran) paket <paketdatoteka>"
-#: rpm.c:332
+#: rpm.c:334
#, fuzzy
msgid " --triggeredby <pkg>"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpm.c:333
+#: rpm.c:335
#, fuzzy
msgid "query packages triggered by <pkg>"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpm.c:334
+#: rpm.c:336
#, fuzzy
msgid " --whatprovides <cap>"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpm.c:335
+#: rpm.c:337
#, fuzzy
msgid "query packages which provide <cap> capability"
msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
-#: rpm.c:336
+#: rpm.c:338
#, fuzzy
msgid " --whatrequires <cap>"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpm.c:337
+#: rpm.c:339
#, fuzzy
msgid "query packages which require <cap> capability"
msgstr "upit za pakete koji zahtevaju <i> svojstvo"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Opcije za selekciju informacije:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "prika¾i informacije o paketu"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "prika¾i dnevnik promene paketa"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "prika¾i listu datoteka u paketu"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "prika¾i stanja datoteka (povlaèi -i)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "prika¾i samo datoteke iz dokumentacije (povlaèi -i)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -507,23 +512,23 @@ msgstr ""
"poka¾i sve informacije koje se mogu proveriti za svaku datoteku (mora se "
"koristiti sa -l, -c ili -d)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "poka¾i koja svojstva donosi paket"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "poka¾i zavisnosti paketa"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "ispi¹i razne skriptove za [de]instalaciju"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
#, fuzzy
msgid ""
"verify a package installation using the same same package specification "
@@ -531,162 +536,162 @@ msgid ""
msgstr ""
"proveri instalaciju paketa koristeæi iste opcije za odreðenje paketa kao i -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "nemoj proveravati md5 kontrolne sume datoteke"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "nemoj proveravati atribute datoteke"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "ispi¹i tag-ove koji mogu biti kori¹æeni u formatu upita"
-#: rpm.c:379
+#: rpm.c:381
#, fuzzy
msgid " --install <packagefile>"
msgstr "instaliraj paket"
-#: rpm.c:380
+#: rpm.c:382
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "instaliraj paket"
-#: rpm.c:382
+#: rpm.c:384
#, fuzzy
msgid " --excludepath <path>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "paket %s nije instaliran\n"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "premesti paket u <dir>, ako se mo¾e premestiti"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "nemoj da instalira¹ dokumentaciju"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "skraæenica za --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "pi¹i he¹-znak (#) kako odmièe instaliranje paketa (dobro doðe sa -v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"instaliraj sve datoteke, èak i konfiguracije koje bi inaèe bile preskoèene"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "nemoj proveravati arhitekturu paketa"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "nemoj proveravati operativni sistem za paket"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "instaliraj dokumentaciju"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "a¾uriraj bazu podataka, ali nemoj menjati fajl-sistem"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "pi¹i procente instalacije paketa"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "instaliraj èak iako æe paket zameniti instalirane datoteke"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "ponovo instaliraj ako je paket veæ prisutan"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "nemoj instalirati, ali reci da li æe da radi ili ne"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "a¾uriraj paket (iste opcije kao --install, plus)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"a¾uriraj na staru verziju paketa (--force kod a¾uriranja ovo radi automatski)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "izbri¹i (deinstaliraj) paket"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -694,107 +699,107 @@ msgstr ""
"ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se gre¹ka ako "
"<paket> oznaèava vi¹e paketa)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "nemoj izvr¹iti nijedan skript iz paketa"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:458
+#: rpm.c:460
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "napravi paket, gde je <faza> jedna od:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "provera liste (mala provera na %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompilacija (priprema i kompilacija)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "instalacija (priprema, kompilacija, instalacija)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "bin/src paket (priprema, kompilacija, instalacija, pakovanje)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "idi pravo do odreðene faze (samo za k,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "ukloni stablo direktorijuma po zavr¹etku"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
#, fuzzy
msgid "generate PGP/GPG signature"
msgstr "napravi PGP potpis"
-#: rpm.c:482
+#: rpm.c:484
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "koristi <dir> kao korenski katalog kod kreiranja"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "nemoj izvr¹iti nijednu fazu"
-#: rpm.c:488
+#: rpm.c:490
#, fuzzy
msgid " --timecheck <secs> "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:489
+#: rpm.c:491
#, fuzzy
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "postavi vremensku proveru na S sekundi (0 je deaktivira)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -802,68 +807,68 @@ msgstr ""
"instaliraj izvorni paket, napravi binarni paket i ukloni specifikaciju, "
"izvorne datoteke, zakrpe i ikone."
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "kao i --rebuild, samo nemoj praviti nikakav paket"
-#: rpm.c:497
+#: rpm.c:499
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "potpi¹i paket (ukloni tekuæi potpis)"
-#: rpm.c:499
+#: rpm.c:501
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "dodaj potpis u paket"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<faza> <spec>\t "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "proveri potpis u paketu"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "preskoèi sve PGP potpise"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
#, fuzzy
msgid "skip any GPG signatures"
msgstr "preskoèi sve PGP potpise"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "preskoèi sve MD5 potpise"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "uveri se da postoji ispravna baza podataka"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -871,7 +876,7 @@ msgstr ""
"postavi dozvole datoteke kao one u bazi podataka paketa koristeæi iste "
"opcije za odreðenje datoteka kao i -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -879,142 +884,150 @@ msgstr ""
"postavi vlasnika i grupu datoteke kao i one u bazi podataka paketa koristeæi "
"iste opcije za odreðenje datoteka kao i -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "samo jedan glavni re¾im mo¾e biti naveden"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u i --uninstall nisu vi¹e podr¾ani i ne rade vi¹e.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Koristite -e ili --erase.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "preme¹tanja moraju poèeti znakom '/'"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "preme¹tanja moraju imati znak ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "preme¹tanja moraju imati / praæeno sa ="
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "preme¹tanja moraju poèeti znakom '/'"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "samo jedan tip upita/provere mo¾e biti uraðen odjednom"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "neoèekivan izvor upita"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "neoèekivan izvor upita"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "neoèekivan izvor upita"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "samo instalacija i a¾uriranje mogu biti forsirane"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "datoteke mogu biti preme¹tene samo tokom instalacije paketa"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate mo¾ete koristiti samo kad instalirate novi paket"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix mo¾ete koristiti samo kod instalacije novog paketa"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti za --prefix moraju poèeti znakom /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludecocs mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includecocs mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "samo jedno mo¾ete da navedete: --excludedocs ili --includedocs"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches mo¾ete koristiti samo kod brisanja paketa"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles mo¾ete koristiti samo kod instalacije paketa"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -1022,7 +1035,7 @@ msgstr ""
"--noscripsts mo¾ete koristiti samo kod instalacije, uklanjanja ili provere "
"paketa"
-#: rpm.c:904
+#: rpm.c:912
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
@@ -1030,7 +1043,7 @@ msgid ""
msgstr ""
"--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1038,14 +1051,14 @@ msgid ""
msgstr ""
"--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1053,102 +1066,102 @@ msgstr ""
"--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili "
"rekreiranja baze podataka"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti za --root (-r) moraju poèeti znakom /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage se mo¾e koristiti samo tokom a¾uriranja paketa"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp se mo¾e koristiti samo prilikom provere potpisa"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp se mo¾e koristiti samo prilikom provere potpisa"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nopgp se mo¾e koristiti samo kod provere potpisa ili paketa"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
#, fuzzy
msgid "pgp not found: "
msgstr "Datoteka nije pronaðena na serveru"
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Neuspela provera lozinke\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Lozinka je dobra.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "neoèekivani argumenti za --querytags"
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "nedostaje paket za proveru potpisa"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "nedostaje paket za potpisivanje"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "neodstaje paket za deinstalaciju"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
@@ -1171,393 +1184,453 @@ msgstr "gre¹ka potrage za paketom %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "napi¹i verziju rpm-a koja se koristi"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "kori¹æenje: {rpm --help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:289
-#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
-msgstr ""
+#: rpmqv.c:295
+#, fuzzy, c-format
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr "\t\t\t paket1 ...paketN"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
#, fuzzy
msgid " [--target=platform1[,platform2...]]"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr "\trpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " svi re¾imi podr¾avaju sledeæe argumente:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "napi¹i verziju rpm-a koja se koristi"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
" instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-ova"
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " na mestu imena datoteka kao i sledeæe opcije:\n"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Opcije odrednice paketa:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "upit nad svim paketima"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "upit za (deinstaliran) paket <paketdatoteka>"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "upit za pakete koji zahtevaju <i> svojstvo"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Opcije za selekciju informacije:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "poka¾i koja svojstva donosi paket"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "poka¾i koja svojstva donosi paket"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "ispi¹i razne skriptove za [de]instalaciju"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr "instaliraj paket"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "upit nad paketom koji ima <datoteku>"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr "instaliraj paket"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr "instaliraj paket"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "paket nema imena"
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<faza> <spec>\t "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Koristite -e ili --erase.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "nedosataje paket za rekreiranje"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "nedostaje specifikacije za kreiranje"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "nedostaju 'tar' datoteke za kreiranje"
@@ -1581,6 +1654,13 @@ msgstr "neuspelo otvaranje %s: %s\n"
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
#, fuzzy
msgid "syntax error while parsing =="
@@ -1806,15 +1886,23 @@ msgstr "neuspelo kreiranje %s\n"
msgid "Processing files: %s-%s-%s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -3070,7 +3158,7 @@ msgstr "neuspelo otvaranje %s: %s\n"
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:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s ne lièi na RPM paket\n"
@@ -3135,7 +3223,7 @@ msgstr "pogre¹an broj paketa: %s\n"
msgid "record %d could not be read\n"
msgstr "ne mogu da proèitam slog %d\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -3414,107 +3502,107 @@ msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
#, fuzzy
msgid "counting packages to install\n"
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "upit nad svim paketima"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, fuzzy
msgid "looking for packages to download\n"
msgstr "gre¹ka kod potrage za paketom %s\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "lo¹e meðuzavisnosti:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" odreðuje vi¹e paketa\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
@@ -3815,101 +3903,109 @@ msgstr "Neoèekivana ili nepoznata FTP gre¹ka"
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
#, fuzzy
msgid "Macro %%%.*s not found, skipping"
msgstr "paket %s nije naðen u %s"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, fuzzy, c-format
msgid "File %s: %s"
msgstr "neuspelo otvaranje %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "upozorenje: "
-
-#: rpmio/rpmlog.c:92
-msgid "error: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
msgstr "gre¹ka: "
-#: rpmio/rpmlog.c:103
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
msgid "fatal error: "
msgstr "fatalna gre¹ka: "
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
+msgid "error: "
+msgstr "gre¹ka: "
+
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "upozorenje: "
+
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -3956,6 +4052,10 @@ msgstr "neuspelo otvaranje %s: %s"
msgid "failed to create %s: %s\n"
msgstr "neuspelo kreiranje %s\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " -b<faza> <spec>\t "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "nedostaje drugo ':' na %s:%d"
diff --git a/po/sv.po b/po/sv.po
index 38224f30e..a02e26211 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: 2000-08-07 16:53+0200\n"
"Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "kan inte öppna %s/packages.rpm\n"
@@ -23,462 +23,467 @@ msgstr "ouppfyllda byggberoenden:\n"
msgid "Unable to open spec file %s: %s\n"
msgstr "Kan inte öppna spec-filen %s: %s\n"
-#: build.c:126 build.c:139
-#, c-format
-msgid "Failed to open tar pipe: %s\n"
+#: build.c:126 build.c:138
+#, fuzzy, c-format
+msgid "Failed to open tar pipe: %m"
msgstr "Kunde inte öppna \"tar\"-rör: %s\n"
#. Give up
-#: build.c:147
-#, c-format
-msgid "Failed to read spec file from %s\n"
+#: build.c:145
+#, fuzzy, c-format
+msgid "Failed to read spec file from %s"
msgstr "Kunde inte läsa spec-fil från %s\n"
-#: build.c:174
-#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+#: build.c:172
+#, fuzzy, c-format
+msgid "Failed to rename %s to %s: %m"
msgstr "Kunde inte byta namn på %s till %s: %s\n"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "kunde inte ta status på %s: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
msgstr "Filen är inte en ordinär fil: %s\n"
-#: build.c:221
-#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+#: build.c:224
+#, fuzzy, c-format
+msgid "File %s does not appear to be a specfile."
msgstr "Filen %s tycks inte vara en spec-fil.\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformar: %s\n"
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr "Bygger för målet %s\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr "rpm: %s\n"
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Den här programvaran kan distribueras fritt med hänsyn till GNU GPL"
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr "Användning: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <kat>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <kat>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <kat>] [--ignoreos] [--nodeps] [--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <värd>] [--ftpport <port>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--httpproxy <värd>] [--httpport <port>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " [--justdb] [--noorder] [--relocate gammalväg=nyväg]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
" [--badreloc] [--notriggers] [--excludepath <sökväg>]"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--ignoresize] fil1.rpm ... filN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <kat>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <fil>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <kat>] [--prefix <kat>] "
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--httpproxy <värd>] [--httpport <port>] "
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate gammalväg=nyväg]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
" [--badreloc] [--excludepath <sökväg>] [--ignoresize]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr " fil1.rpm ... filN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr " [--scripts] [--root <kat>] [--rcfile <fil>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr " [--whatprovides] [--whatrequires] [--requires]"
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr " [--triggeredby]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr " [--provides] [--triggers] [--dump]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--changelog] [--dbpath <kat>] [mål]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr " rpm {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <kat>] [--nodeps] [--nofiles] [--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [mål]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [mål]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [mål]"
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " rpm {--freshen -F} fil1.rpm ... filN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr " rpm {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <kat>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] [--notriggers] paket1 ... paketN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <fil>] paket1 paket2 ... paketN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <fil>] paket1 paket2 ... paketN"
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " paket1 ... paketN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr "Användning:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "visa detta meddelande"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "visa vilken version av rpm som används"
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr " Alla arbetssätt stödjer följande argument:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr " --define '<namn> <kropp>'"
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr "definiera makrot <namn> som <kropp>"
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr " --eval '<namn>+' "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr "skriv ut expansionen av makrot <namn> på standard ut"
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr " --pipe <kommando> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "skicka stdut till <kommando>"
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr " --rcfile <fil> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "använd <fil> istället för /etc/rpmrc och $HOME/.rpmrc"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr "visa slutliga rpmrc- och makrokonfigurationer"
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "var lite mer mångordig"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "var mycket mångordig (för felsökning)"
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" Installation, uppgradering och fråga (med -p) tillåter URL:er att användas"
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr " istället för filnamn, liksom följande flaggor:"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <värd> "
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "ftp-ombudets (proxy) värdnamn eller IP"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "ftp-servers (eller ombuds (proxy)) portnummer"
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr " --httpproxy <värd> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr "http-ombudets värdnamn eller IP"
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr "http-servers (eller ombuds) portnummer"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "frågeläge"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr " --dbpath <kat> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "använd <kat> som katalog för databasen"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr " --queryformat <ffmt>"
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr "använd <ffmt> som huvudformat (medför --info)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr " --root <kat> "
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Flaggor för paketval:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "fråga om alla paket"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr " -f <fil>+ "
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "fråga om paket som äger <fil>"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr " -p <paketfil>+ "
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "fråga om (oinstallerat) paket <paketfil>"
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr " --triggeredby <pkt>"
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr "fråga om paket utlösta av <pkt>"
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr " --whatprovides <egenskap>"
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr "undersök paket som tillhandahåller <egenskap>"
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr " --whatrequires <egenskap>"
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr "undersök paket som behöver <egenskap>"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Flaggor för informationsval:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "visa paketinformation"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "visa paketets ändringslogg"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "visa paketets fillista"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "visa filers status (implicerar -l)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "visa enbart dokumentationsfiler (implicerar -l)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr "visa enbart konfigurationsfiler (implicerar -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -486,164 +491,164 @@ msgstr ""
"visa all verifierbar information för varje fil (måste användas med -l, -c "
"eller -d)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "visa de egenskaper paketet tillhandahåller"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "lista paketberoenden"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "visa de olika [av]installationsskripten"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr "visa utlösningsskripten i paketet"
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr "verifiera ett pakets installation med samma urvalsflaggor som till -q"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "verifiera inte paketberoenden"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "verifiera inte md5-kontrollsummor"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "verifiera inte filattribut"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "visa taggar som kan användas i frågeformat"
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr " --install <paketfil>"
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr " -i <paketfil> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "installera paket"
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr " --excludepath <sökväg>"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr "hoppa över filer i <sökv>"
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <frånskv>=<tillskv>"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "flytta filer från <frånskv> till <tillskv>"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr "relokera filer i ej relokerbart paket"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr " --prefix <katalog> "
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "flytta paketet till <katalog>, om flyttbart"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "installera inte dokumentation"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "kortform för --replacepkgs --replacefiles"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
"skriv ut brädgårdar allt eftersom paketet installeras (bra tillsammans med "
"-v)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"installera alla filer, även konfigurationer som annars kunde hoppats över"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "verifiera inte paketarkitektur"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr "kontrollera inte diskutrymme före installation"
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "verifiera inte paketets operativsystem"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "installera dokumentation"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "uppdatera databasen, men ändra inte filsystemet"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "kör inte installationsskript"
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr "kör inte utlösningsskript utlösta av detta paket"
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "skriv procent allt eftersom paketet installeras"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "installera även om paketet byter ut installerade filer"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "installera om ifall paketet redan är installerat"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr " --upgrade <paketfil>"
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr " -U <paketfil> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "uppgradera paket (samma flaggor som --install, samt)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -651,15 +656,15 @@ msgstr ""
"uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
"detta automatiskt)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr " --erase <paket>"
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "ta bort (avinstallera) paket"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -667,100 +672,100 @@ msgstr ""
"ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
"specificerar flera paket)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "kör inte paketspecifika skript"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<steg> <spec> "
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr " -t<steg> <tarboll> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "tillverka paket, där <steg> är något av:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "förbered (packa upp källkod samt applicera patchar)"
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "kontrollera (gör några enkla kontroller på %files)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "kompilera (förbered och kompilera)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "installera (förbered, kompilera, installera)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr "binärpaketera (förbered, kompilera, installera, paketera)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr "binär- och källpaketera (förbered, kompilera, installera, paketera)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "gå direkt till angivet steg (endast för c,i)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "ta bort tillverkningsträd efteråt"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr "ta bort källkod efteråt"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr "ta bort spec-fil efteråt"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr "tillverka en PGP/GPG-signatur"
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr " --buildroot <kat> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "använd <kat> som tillverkningsrot"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr " --target=<plattfrm>+"
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr "tillverka paketen för målen plattfrm1...plattfrmN."
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "utför inga steg"
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr " --timecheck <sek> "
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "sätt tidskontrollen till <sek> sekunder (0 slår av)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <källpaket> "
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -768,63 +773,63 @@ msgstr ""
"installera källpaket, tillverka binärpaket och ta bort spec-fil, källkod, "
"patchar och ikoner."
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr " --recompile <källpkt> "
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "som --rebuild, men tillverka inga paket"
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr " --resign <pkt>+ "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "signera ett paket (släng nuvarande signatur)"
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr " --addsign <pkt>+ "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "lägg till signatur till ett paket"
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr " --checksig <pkt>+"
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr " -K <pkt>+ "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "verifiera paketsignatur"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "hoppa över eventuella PGP-signaturer"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr "hoppa över eventuella GPG-signaturer"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "hoppa över eventuella MD5-signaturer"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "förvissa dig om att en giltig databas existerar"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "bygg om databasen från existerande databas"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -832,7 +837,7 @@ msgstr ""
"sätt filrättigheterna till de i paketdatabasen med samma "
"paketspecifikationsflaggor som -q"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -840,139 +845,147 @@ msgstr ""
"sätt filägare och -grupp till de i paketdatabasen med samma "
"paketspcifikationsflaggor som -q"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "enbart ett läge kan specifieras"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u och --uninstall undanbedes och fungerar inte längre.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Använd -e eller --erase istället.\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "omflyttningar måste börja med /"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "omflyttningar måste innehålla ett ="
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "omflyttningar måste ha ett / efter ="
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr "uteslutna sökvägar måste börja med /"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Internt fel i argumenthantering (%d) :-(\n"
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "endast en typ av undersökning/verifiering kan utföras åt gången"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr "oväntade undersökningsflaggor"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr "oväntat undersökningsformat"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "oväntad undersökningskälla"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "filer kan relokeras endast under paketinstallation"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "enbart en av --prefix eller --relocate kan användas"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate och --excludepath kan endast användas när nya paket installeras"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan endast användas när nya paket installeras"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "argument till --prefix måste börja med /"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan enbart användas vid paketinstallation"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent kan enbart användas vid paketinstallation"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan enbart användas vid paketinstallation"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan enbart användas vid paketinstallation"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan enbart användas vid paketinstallation"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan enbart användas vid paketinstallation"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "enbart en av --excludedocs och --includedocs läge kan specifieras"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan enbart användas vid paketinstallation"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan enbart användas vid paketinstallation"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan enbart användas vid paketinstallation"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan enbart användas när paket tas bort"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan enbart användas vid paketinstallation"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb kan enbart användas vid installation och avinstallation av paket"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
@@ -980,7 +993,7 @@ msgstr ""
"--noscripts kan enbart användas vid paketinstallation, avinstallation och "
"verifiering"
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
@@ -988,7 +1001,7 @@ msgstr ""
"--notriggers kan enbart användas vid installation, avinstallation och "
"verifiering"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -996,14 +1009,14 @@ msgstr ""
"--nodeps kan enbart användas vid tillverkning, omtillverkning, "
"omkompilering, installation, avinstallation, och verifiering"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test kan enbart användas vid installation, avinstallation och tillverkning"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1011,97 +1024,97 @@ msgstr ""
"--root (-r) kan enbart användas vid installation, avinstallation, förfrågan, "
"och databasombyggnad"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "argument till --root (-r) måste börja med /"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage kan enbart användas vid paketuppgraderingar"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp kan enbart användas vid signaturkontroll"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr "--nogpg kan enbart användas vid signaturkontroll"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr "--nomd5 kan enbart användas vid signaturkontroll och paketverifiering"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr "inga filer att signera\n"
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr "kan inte komma åt filen %s\n"
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr "pgp hittades inte: "
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr "Ange lösenfras: "
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Kontrollen av lösenfrasen misslyckades\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Lösenfrasen är ok.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Felaktig %%_signature spec i makrofil.\n"
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign kan enbart användas vid pakettillverkning"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "inga paket angivna för signaturkontroll"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "inga paket angivna för signering"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "inga paket angivna för avinstallation"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "extra argument angivna för förfrågan om alla paket"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "inga parametrar angivna för undersökning"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr "extra argument angivna för verifiering av alla paket"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
@@ -1123,346 +1136,411 @@ msgstr "fel vid läsning av pakethuvud\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan inte återöppna lasten: %s\n"
-#: rpmqv.c:284
+#: rpmqv.c:152
+#, fuzzy
+msgid "'<name> <body>'"
+msgstr " --define '<namn> <kropp>'"
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "skriv ut expansionen av makrot <namn> på standard ut"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Användning: %s {--help}\n"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " %s {--initdb} [--dbpath <kat>]\n"
-#: rpmqv.c:289
-#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#: rpmqv.c:295
+#, fuzzy, c-format
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " %s {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]\n"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-#: rpmqv.c:313
-#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <fil>]"
+
+#: rpmqv.c:319
+#, fuzzy, c-format
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr " %s {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]\n"
-#: rpmqv.c:327
-#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr " [--scripts] [--root <kat>] [--rcfile <fil>]"
+
+#: rpmqv.c:333
+#, fuzzy, c-format
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr " %s {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]\n"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " %s {--setperms} [-afpg] [mål]\n"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " %s {--setugids} [-afpg] [mål]\n"
-#: rpmqv.c:336
-#, c-format
+#: rpmqv.c:342
+#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile <fil>]\n"
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr " [--target=plattform1[,plattform2...]]"
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr " [--rmsource] [--rmspec] spec-fil"
-#: rpmqv.c:340
-#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#: rpmqv.c:346
+#, fuzzy, c-format
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " %s {--rmsource} [--rcfile <fil>] [-v] spec-fil\n"
-#: rpmqv.c:341
-#, c-format
+#: rpmqv.c:347
+#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--rebuild} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
-#: rpmqv.c:342
-#, c-format
+#: rpmqv.c:348
+#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" %s {--recompile} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " %s {--freshen -F} fil1.rpm ... filN.rpm\n"
-#: rpmqv.c:347
-#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#: rpmqv.c:353
+#, fuzzy, c-format
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " %s {--resign} [--rcfile <fil>] paket1 paket2 ... paketN\n"
-#: rpmqv.c:348
-#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+#: rpmqv.c:354
+#, fuzzy, c-format
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr " %s {--addsign} [--rcfile <fil>] paket1 paket2 ... paketN"
-#: rpmqv.c:349
-#, c-format
+#: rpmqv.c:355
+#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr " Alla arbetssätt stödjer följande argument:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr " --define '<namn> <kropp>'"
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+#, fuzzy
+msgid " --eval '<expr>+' "
msgstr " --eval '<namn>+' "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "skriv ut expansionen av makrot <namn> på standard ut"
+
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr " --pipe <kommando> "
-#: rpmqv.c:400
-msgid " --rcfile <file> "
-msgstr " --rcfile <fil> "
+#: rpmqv.c:406
+#, fuzzy
+msgid " --macros <file:...> "
+msgstr " --rcfile <fil> "
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr " --dbpath <kat> "
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr " --root <kat> "
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
" Installera, uppgradera och fråga (med -p) tillåter URL:er att användas"
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr " istället för filnamn, liksom följande flaggor:"
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr " --ftpproxy <värd> "
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr " --ftpport <port> "
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr " --httpproxy <värd> "
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr " --httpport <port> "
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr " Flaggor för paketval:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr "fråga om/verifiera alla paket"
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr " -f <fil>+ "
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr "fråga om/verifiera paket som äger <fil>"
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr " -p <paketfil>+ "
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "fråga om/verifiera (oinstallerat) paket <paketfil>"
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr " --triggeredby <pkt> "
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr "fråga om/verifiera paket utlösta av <pkt>"
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr " --whatprovides <egenskap>"
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr "fråga om/verifiera paket som tillhandahåller <egenskap>"
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr " --whatrequires <egenskap>"
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr "fråga om/verifiera paket som behöver <egenskap>"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr " --queryformat <ffmt> "
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr " Flaggor för informationsval:"
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr "visa de egenskaper paketet tillhandahåller"
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr "visa de egenskaper paketet behöver"
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr "visa de olika [av]installationsskripten"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr "visa utlösningsskripten i paketet"
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr " --install <paketfil> "
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr " -i <paketfil> "
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr " --excludepath <sökväg>"
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr "hoppa över filer med inledande <sökväg>"
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr "kör inte installationsskript"
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr "kör inte utlösningsskript utlösta av detta paket"
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr " --prefix <katalog> "
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr " --relocate <frånskv>=<tillskv>"
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr " --upgrade <paketfil> "
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr " -U <paketfil> "
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr " --erase <paket> "
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr " -b<steg> <spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr " -t<steg> <tar-arkiv> "
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr "paket endast källrpm"
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr " --buildroot <kat> "
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr " --target=<plattform>+"
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr " --rebuild <källpaket> "
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr " --recompile <källpaket>"
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr " --resign <pkt>+ "
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr " --addsign <pkt>+ "
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr " --checksig <pkt>+"
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr " -K <pkt>+ "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr "initiera databasen (onödigt, ärvt format)"
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr "bygg om databasindex från existerande databashuvuden"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Använd -e eller --erase istället.\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath angivet för en operation som inte använder någon databas"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
"--notriggers kan enbart användas vid installation och avinstallation av paket"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna för omtillverkning"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "ingen spec-filer angivna för tillverkning"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "inga tar-filer angivna för tillverkning"
@@ -1485,6 +1563,13 @@ msgstr "Körning (exec) av %s misslyckades (%s): %s"
msgid "Bad exit status from %s (%s)"
msgstr "Dålig slutstatus från %s (%s)"
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr "syntaxfel vid parsning av =="
@@ -1704,15 +1789,23 @@ msgstr "Misslyckades med att hitta %s:"
msgid "Processing files: %s-%s-%s\n"
msgstr "Bearbetar filer: %s-%s-%s\n"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
-msgstr "RPMERR_INTERNAL: Slog i begränsning i getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
-msgstr "RPMERR_INTERNAL: Slog i begränsning i getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr "Kunde inte kanonisera värdnamn: %s\n"
@@ -2938,7 +3031,7 @@ msgstr "misslyckades öppna %s: %s\n"
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:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s verkar inte vara ett RPM-paket\n"
@@ -3002,7 +3095,7 @@ msgstr "paketpost nummer: %u\n"
msgid "record %d could not be read\n"
msgstr "post %d kunde inte läsas\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
@@ -3305,104 +3398,104 @@ msgstr "tar bort katalog %s\n"
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr "räknar paket att installera\n"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr "hittade %d paket\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr "letar efter paket att hämta\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "hoppar över %s - rpmGlob misslyckades(%d)\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "Hämtar %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr "hämtade %d paket\n"
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte öppna filen %s: %s\n"
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr "kan inte öppna paketdatabas i %s\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning från fil %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "filen %s behöver en nyare version av RPM\n"
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
@@ -3684,99 +3777,107 @@ msgstr "Okänt eller oväntat fel"
msgid "logging into %s as %s, pw %s\n"
msgstr "loggar in på %s som %s, lösenord %s\n"
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr "======================== aktiva %d tomma %d\n"
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr "%3d>%*s(tom)"
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr "%3d<%*s(tom)\n"
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr "Makro %%%s har oavslutad kropp"
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr "Makro %%%s har otillåtet namn (%%define)"
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr "Makro %%%s har oavslutade flaggor"
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr "makro %%%s har tom kropp"
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr "Makro %%%s misslyckades att expandera"
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr "Makro %%%s har otillåtet namn (%%undefine)"
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr "Makro %%%s (%s) var inte använd under nivå %d"
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr "Okänd flagga %c i %s(%s)"
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr "Rekursionsdjup(%d) större än max(%d)"
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr "Oavslutad %c: %s"
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr "Ett %% följs av ett makro som inte kan parsas"
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr "Inget makro %%%.*s hittat, hoppar över"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr "Målbuffer översvämmad"
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr "Fil %s: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr "Filen %s är mindre än %d byte"
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "varning: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
+msgstr "(fel 0x%x)"
+
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr "fatalt fel: "
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr "fel: "
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
-msgstr "fatalt fel: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "varning: "
#: rpmio/rpmmalloc.c:13
#, c-format
@@ -3823,6 +3924,15 @@ msgstr "kunde inte öppna %s: %s\n"
msgid "failed to create %s: %s\n"
msgstr "kunde inte skapa %s: %s\n"
+#~ msgid " --rcfile <file> "
+#~ msgstr " --rcfile <fil> "
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#~ msgstr "RPMERR_INTERNAL: Slog i begränsning i getUname()\n"
+
+#~ msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#~ msgstr "RPMERR_INTERNAL: Slog i begränsning i getGname()\n"
+
#~ msgid "internal error (rpm bug?): "
#~ msgstr "internt fel (fel i rpm?): "
diff --git a/po/tr.po b/po/tr.po
index 6798ad95f..ecdaef19a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, fuzzy, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
@@ -30,44 +30,49 @@ msgid "Unable to open spec file %s: %s\n"
msgstr "%s okuma eriþimi için açýlamadý:%s."
# , c-format
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, fuzzy, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr "%s 'ye eriþimde hata oluþtu\n"
#. Give up
-#: build.c:147
+#: build.c:145
#, fuzzy, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr "%s okunamadý: %s"
-#: build.c:174
+#: build.c:172
#, fuzzy, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr "%s okunamadý: %s"
-#: build.c:214
-#, c-format
-msgid "File is not a regular file: %s\n"
-msgstr ""
+#: build.c:211
+#, fuzzy, c-format
+msgid "failed to stat %s: %m"
+msgstr "%s açýlamadý: %s"
+
+#: build.c:216
+#, fuzzy, c-format
+msgid "File %s is not a regular file."
+msgstr "%s bir RPM paketi deðil (gibi)\n"
-#: build.c:221
+#: build.c:224
#, fuzzy, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s does not appear to be a specfile."
msgstr "%s bir RPM paketi deðil (gibi)\n"
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, fuzzy, c-format
msgid "Building for target %s\n"
msgstr "%s paketi bulunamadý\n"
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
@@ -85,460 +90,460 @@ msgstr ""
# May 5, 1998
#
# , c-format
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Sürüm %s\n"
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr "Bu ðrogram GNU GPL uyarýnca serbestçe daðýtýlabilir."
-#: rpm.c:202
+#: rpm.c:204
#, fuzzy
msgid "Usage: rpm {--help}"
msgstr "Kullaným: rpm {--help}"
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr " rpm {--version}"
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr " rpm {--initdb} [--dbpath <dizin>]"
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
" [--replacepkgs] [--replacefiles] [--root <dizin>]"
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr " [--excludedocs] [--includedocs] [--noscripts]"
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
" [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
" [--prefix <dizin>] [--ignoreos] [--nodeps] "
"[--allfiles]"
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr " [--ftpproxy <sunucu>] [--ftpport <port>]"
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr " [--ftpproxy <sunucu>] [--ftpport <port>]"
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
#, fuzzy
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate eskidizin=yenidizin]"
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
#, fuzzy
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr " [--badreloc] dosya1.rpm ... dosyaN.rpm"
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
#, fuzzy
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr " [--badreloc] dosya1.rpm ... dosyaN.rpm"
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr " [--oldpackage] [--root <dizin>] [--noscripts]"
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
" [--excludedocs] [--includedocs] [--rcfile <dosya>]"
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
" [--ignorearch] [--dbpath <dizin>] [--prefix "
"<dizin>] "
-#: rpm.c:220
+#: rpm.c:222
#, fuzzy
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr " [--ftpproxy <sunucu>] [--ftpport <port>]"
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
" [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr " [--noorder] [--relocate eskidizin=yenidizin]"
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
#, fuzzy
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr " [--nomd5] [targets]"
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
#, fuzzy
msgid " file1.rpm ... fileN.rpm"
msgstr " [--badreloc] dosya1.rpm ... dosyaN.rpm"
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
" [--scripts] [--root <dizin>] [--rcfile <dosya>]"
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
#, fuzzy
msgid " [--triggeredby]"
msgstr " [--nomd5] [targets]"
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
#, fuzzy
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
" [--dbpath <dizin>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
#, fuzzy
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr " [--nomd5] [targets]"
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
" [--dbpath <dizin>] [--nodeps] [--nofiles] "
"[--noscripts]"
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr " [--nomd5] [targets]"
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr " rpm {--setperms} [-afpg] [target]"
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr " rpm {--setugids} [-afpg] [target]"
-#: rpm.c:238
+#: rpm.c:240
#, fuzzy
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr " [--badreloc] dosya1.rpm ... dosyaN.rpm"
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
" rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr " [--dbpath <dizin>] [--nodeps] [--allmatches]"
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
#, fuzzy
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr " [--justdb] paket1 ... paketN"
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--resign} [--rcfile <dosya>] paket1 paket2 ... paketN"
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <dosya>] paket1 paket2 ... paketN"
-#: rpm.c:244
+#: rpm.c:246
#, fuzzy
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr " paket1 ... paketN"
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr " rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr " rpm {--querytags}"
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
#, fuzzy
msgid "Usage:"
msgstr "Kullaným:"
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr "Bu bilgiyi verir"
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr "Kullanýlan RPM sürümünü verir"
-#: rpm.c:288
+#: rpm.c:290
#, fuzzy
msgid " All modes support the following arguments:"
msgstr " tüm kipler aþaðýdaki argümanlarý kabul ederler:"
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
#, fuzzy
msgid " --eval '<name>+' "
msgstr " -b<adým> <spec> "
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
#, fuzzy
msgid "print the expansion of macro <name> to stdout"
msgstr "Kullanýlan RPM sürümünü verir"
-#: rpm.c:293
+#: rpm.c:295
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<adým> <spec> "
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr "standart çýktýyý <KOMUT>'a gönderir"
-#: rpm.c:295
+#: rpm.c:297
#, fuzzy
msgid " --rcfile <file> "
msgstr " -b<adým> <spec> "
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr "/etc/rpmrc ve $HOME/.rpmrc yerine <dosya> kullanýn"
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr "daha çok açýklama verir"
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr "çok fazla açýklama verir (hata ayýklama için)"
-#: rpm.c:305
+#: rpm.c:307
#, fuzzy
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
" yükleme, güncelleme ve sorgulama (-p ile) iþlemlerimde dosya isimleri "
-#: rpm.c:306
+#: rpm.c:308
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " yerine FTP adreslerini aþaðýdaki seçeneklerle kabul eder:\n"
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
-#: rpm.c:311
+#: rpm.c:313
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<adým> <spec> "
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
#, fuzzy
msgid "hostname or IP of http proxy"
msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
-#: rpm.c:313
+#: rpm.c:315
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<adým> <spec> "
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
#, fuzzy
msgid "port number of http server (or proxy)"
msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr "Sorgulama kipi"
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<adým> <spec> "
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr "Veritabaný dizini olarak <dizin> kullanýlýr"
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
#, fuzzy
msgid "use <qfmt> as the header format (implies --info)"
msgstr "'header format' olarak s kullanýlýr (-i'yi gerektirir)"
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr "kök (baþlangýç) dizini olarak <dizin> kullanýlýr"
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr " Paket seçim seçenekleri:"
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr "Tüm paketleri sorgulama"
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr "(henüz yüklenmemiþ) <paket dosyasý> paketi sorgulama"
-#: rpm.c:332
+#: rpm.c:334
#, fuzzy
msgid " --triggeredby <pkg>"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: rpm.c:333
+#: rpm.c:335
#, fuzzy
msgid "query packages triggered by <pkg>"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: rpm.c:334
+#: rpm.c:336
#, fuzzy
msgid " --whatprovides <cap>"
msgstr " --requires"
-#: rpm.c:335
+#: rpm.c:337
#, fuzzy
msgid "query packages which provide <cap> capability"
msgstr "<i> yeteneði olan paketleri sorgulama"
-#: rpm.c:336
+#: rpm.c:338
#, fuzzy
msgid " --whatrequires <cap>"
msgstr " --requires"
-#: rpm.c:337
+#: rpm.c:339
#, fuzzy
msgid "query packages which require <cap> capability"
msgstr "<i> yeteneðine ihtiyaç duyan paketleri sorgulama"
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr " Bilgilendirme seçenekleri:"
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr "Paket bilgisini gösterme"
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr "Paketin 'Change Log' (deðiþiklik) bilgisini gösterme"
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr "Paketin içerdiði dosyalarý gösterme"
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr "dosyalarýn durumunu gösterir (-l gerektirir)"
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr "sadece belge dosyalarýný gösterir (-l gerektirir)"
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
"sadece yapýlandýrma (configuration) dosyalarýný gösterir (impliziert -l)"
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
@@ -546,183 +551,183 @@ msgstr ""
"her dosya için doðrulanabilir bilgileri göster (-l, -c veya -d ile "
"kullanýlmalý)"
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr "paketin saðladýðý yetenekleri sýralar"
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr "paketin baðýmlýlýklarýný (gerektirdiði paketleri) gösterir"
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr "paketin çeþitli yükleme, silme betiklerini (scripts) gösterir"
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr "paketi -q ile belirtilen paket parametrelerini kullanarak doðrula"
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr "paket baðýmlýlýklarýný doðrulamaz"
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr "dosyalarýn 'md5-checksum' larýný doðrulamaz"
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr "dosya özelliklerini doðrulamaz"
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr "sorgulama sýrasýnda kullanýlabilecek 'Tag'leri sýralar"
-#: rpm.c:379
+#: rpm.c:381
#, fuzzy
msgid " --install <packagefile>"
msgstr "paket yüklemek"
-#: rpm.c:380
+#: rpm.c:382
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<adým> <spec> "
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr "paket yüklemek"
-#: rpm.c:382
+#: rpm.c:384
#, fuzzy
msgid " --excludepath <path>"
msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
#, fuzzy
msgid "relocate files in non-relocateable package"
msgstr "%s pakedi yüklenmemiþ\n"
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr "paketin yerini (eðer deðitirilebiliyorsa) <dizin>'e deðiþtirir"
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr "yazýlýmýn belgelerini yüklemez"
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr "--replacepkgs --replacefiles'ýn kýsaltmasý"
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr "yükleme sýrasýnda bir gösterge çýkarýr (-v seçeneði ile iyi)"
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
"tüm dosyalarý, hatta normal olarak atlanabilecek yapýlandýrmalarý bile,yükler"
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr "paket mimarisini doðrulamaz"
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr "paketin ait olduðu iþletim sistemini doðrulamaz"
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr "paket ile gelen belgeleri de yükler"
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr "veri tabanýný günceller, ama dosya sistemini deðiþtirmez"
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr "paket yükleme sýrasýný baðýmlýlýklara göre düzenleme"
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr "yükleme betiklerini (scripts) çalýþtýrmaz."
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr "yükleme sýrasýnda geliþme yüzde olarak gösterilir"
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr "paket mevcut dosyalarý silse bile paketi yükler"
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr "paket mevcutsa yeniden yükler"
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr "yükleme yapmaz, sadece çalýþýp çalýþmayacaðýný belirtir"
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<adým> <spec> "
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr "Paketi günceller (seçenekler --install ile ayný, ek olarak)"
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"pakedin eski bir sürüme güncellenmesini saðlar (--force ayný iþi görür)"
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr "paketi siler (uninstall)"
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
@@ -730,111 +735,111 @@ msgstr ""
"<paket> ile eþlenen tüm paketleri siler (birden fazla paket eþlenirse bir "
"hata mesajý çýkmasý gerekir)"
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr "pakete ait hiçbir betik (Script) çalýþtýrýlmaz"
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr " -b<adým> <spec> "
-#: rpm.c:458
+#: rpm.c:460
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<adým> <spec> "
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr "paket yaratýr, <adým> aþaðýdaki harflerden biridir:"
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr "hazýrlama (kaynaklar açýlýr ve yamalar uygulanýr)"
# , c-format
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr "kontrol ( %files üstünkörü bir kontrol edilir)"
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr "derleme (hazýrlama ve derleme)"
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr "yükleme (hazýrlama, derleme, yükleme)"
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
"çalýþtýrýlabilir paket yaratma (hazýrlama, derleme, yükleme, paketleme)"
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
"çalýþtýrýlabilir ve Kaynak paket yaratmak (hazýrlama, derleme, yükleme "
"vepaketleme)"
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr "doðrudan belirtilen adýma atlar (sadece c ve i için)"
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr "iþlem sonunda paket yaratma yapýsýný siler"
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
#, fuzzy
msgid "remove sources when done"
msgstr "iþlem sonunda kaynaklarý ve spec dosyasýný siler"
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
#, fuzzy
msgid "remove spec file when done"
msgstr "iþlem sonunda kaynaklarý ve spec dosyasýný siler"
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
#, fuzzy
msgid "generate PGP/GPG signature"
msgstr "PGP-imzasý yaratýr"
-#: rpm.c:482
+#: rpm.c:484
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<adým> <spec> "
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr "paket yaratýlýrken <dizin> baþlangýç dizini olarak kullanýlýr"
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr "adýmlarýn hiçbirini çalýþtýrmaz"
-#: rpm.c:488
+#: rpm.c:490
#, fuzzy
msgid " --timecheck <secs> "
msgstr " -b<adým> <spec> "
-#: rpm.c:489
+#: rpm.c:491
#, fuzzy
msgid "set the time check to <secs> seconds (0 disables)"
msgstr "zaman kontrolünü S saniyeye ayarlar (0 ile tümüyle kaldýrýr)"
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
@@ -842,68 +847,68 @@ msgstr ""
"kaynak paketini yükler, çalýþýr paketi oluþturur ve spec dosyasý, kaynaklar "
"ile yamalarý siler"
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr "--rebuild gibi, ama paket yaratmaz"
-#: rpm.c:497
+#: rpm.c:499
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
-#: rpm.c:499
+#: rpm.c:501
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr "pakete bir imza ekler"
-#: rpm.c:501
+#: rpm.c:503
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<adým> <spec> "
-#: rpm.c:502
+#: rpm.c:504
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr "paket imzasýný doðrular"
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr "tüm PGP imzalarýný atlar"
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
#, fuzzy
msgid "skip any GPG signatures"
msgstr "tüm PGP imzalarýný atlar"
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr "tüm MD5 imzalarýný atlar"
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr "geçerli bir veri tabaný olmasýný saðlar"
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
@@ -911,7 +916,7 @@ msgstr ""
"dosya eriþim haklarýný veri tabanýnda yer alanlarla -q ile belirtilen paket "
"parametrelerini kullanarak güncelle"
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
@@ -919,149 +924,157 @@ msgstr ""
"dosya kullanýcý ve grup bilgilerini veri tabanýnda yer alanlarla -q ile "
"belirtilen paket parametrelerini kullanarak güncelle"
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr "sadece bir ana kip (major mode) belirtilebilir"
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr "-u ve --uninstall komutlarý eskidirler ve çalýþmamaktadýrlar.\n"
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr "Yerine -e veya --erase komutunu kullanýn\n"
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr "relocate iþlemi / ile baþlamalý"
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr "relocate satýrýnda = bulunmalý"
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr "relocate için = den sonra bir / gerekir"
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
#, fuzzy
msgid "exclude paths must begin with a /"
msgstr "relocate iþlemi / ile baþlamalý"
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr "bir anda sadece bir tarz sorgulama veya doðrulama yapýlabilir"
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
#, fuzzy
msgid "unexpected query flags"
msgstr "beklenmeyen sorgulama kaynaðý girildi"
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
#, fuzzy
msgid "unexpected query format"
msgstr "beklenmeyen sorgulama kaynaðý girildi"
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr "beklenmeyen sorgulama kaynaðý girildi"
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "sadece yükleme ve güncelleme zorlanabilir (force edilebilir)"
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr "dosyalar sadece paket yüklemesi sýrasýnda relocate edilebilir"
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir"
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate sadece yeni paketler yüklenirken kullanýlýr"
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix sadece yeni paketlerin yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix komutunun argümanlarý '/' ile baþlamalý"
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr "--percent sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"--excludedocs ve --includedocs bir arada kullanýlamaz (bi daha olmasýn)"
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sadece paket silinmesi sýrasýnda kullanýlabilir"
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr "--noscripts sadece paket yükleme, silme ve doðrulamalarýnda kullanýlýr"
-#: rpm.c:904
+#: rpm.c:912
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
@@ -1069,7 +1082,7 @@ msgid ""
msgstr ""
"--nodeps sadece paket yüklemelerinde, silme ve doðrulamalarda kullanýlýr"
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -1077,13 +1090,13 @@ msgid ""
msgstr ""
"--nodeps sadece paket yüklemelerinde, silme ve doðrulamalarda kullanýlýr"
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test sadece paket yüklemelerinde, silme ve derlemelerinde kullanýlýr"
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -1091,103 +1104,103 @@ msgstr ""
"--root (-r) sadece yükleme, silme, sorgulama ve veritabaný güncellemelerinde "
"kullanýlýr"
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) komutun argümanlarý '/' ile baþlamalý"
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr "--oldpackage sadece güncelleme sýrasýnda kullanýlabilir"
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
#, fuzzy
msgid "--nogpg may only be used during signature checking"
msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
#, fuzzy
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
"--nopgp sadece imza kontrolü veya paket doðrulamasý sýrasýnda kullanýlýr"
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
#, fuzzy
msgid "pgp not found: "
msgstr "Dosya sunucuda bulunamadý"
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr "Parola kontrolü baþarýsýzlýkla sonuçlandý\n"
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr "Parola doðru.\n"
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr "--sign sadece paket olusturulurken kullanýlabilir"
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Eriþilemedi\n"
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr "--querytags için beklenmeyen argümanlar"
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr "imzasý kontrol edilecek paketler belirtilmedi"
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr "imzalanacak paketler belirtilmedi"
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr "sistemden silinecek paketler belirtilmedi"
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr "yüklenecek paketler belirtilmedi"
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
#, fuzzy
msgid "extra arguments given for verify of all packages"
msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr "doðrulama için hiç argüman belirtilmedi"
@@ -1210,401 +1223,464 @@ msgstr "%s paketi bulunamadý\n"
msgid "cannot re-open payload: %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+#, fuzzy
+msgid "print macro expansion to stdout"
+msgstr "Kullanýlan RPM sürümünü verir"
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Kullaným: rpm {--help}"
-#: rpmqv.c:288
+#: rpmqv.c:294
#, fuzzy, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr " rpm {--initdb} [--dbpath <dizin>]"
-#: rpmqv.c:289
+#: rpmqv.c:295
#, fuzzy, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr " rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
-#: rpmqv.c:293
+#: rpmqv.c:299
#, fuzzy, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-#: rpmqv.c:313
+#: rpmqv.c:302
+#, fuzzy
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+" [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
+
+#: rpmqv.c:311
+#, fuzzy
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+" [--excludedocs] [--includedocs] [--rcfile <dosya>]"
+
+#: rpmqv.c:319
#, fuzzy, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
msgstr ""
" rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
-#: rpmqv.c:327
+#: rpmqv.c:326
+#, fuzzy
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+" [--scripts] [--root <dizin>] [--rcfile <dosya>]"
+
+#: rpmqv.c:333
#, fuzzy, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
" rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
-#: rpmqv.c:331
+#: rpmqv.c:337
#, fuzzy, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr " rpm {--setperms} [-afpg] [target]"
-#: rpmqv.c:332
+#: rpmqv.c:338
#, fuzzy, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr " rpm {--setugids} [-afpg] [target]"
-#: rpmqv.c:336
+#: rpmqv.c:342
#, fuzzy, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
"<dosya>]"
-#: rpmqv.c:338
+#: rpmqv.c:344
#, fuzzy
msgid " [--target=platform1[,platform2...]]"
msgstr " [targets]"
-#: rpmqv.c:339
+#: rpmqv.c:345
#, fuzzy
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
" [--buildarch <mimari>] [--rmsource] specdosyasý"
-#: rpmqv.c:340
+#: rpmqv.c:346
#, fuzzy, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr " rpm {--rmsource} [--rcfile <dosya>] [-v] specdosyasý"
-#: rpmqv.c:341
+#: rpmqv.c:347
#, fuzzy, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--rebuild} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
-#: rpmqv.c:342
+#: rpmqv.c:348
#, fuzzy, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
" rpm {--recompile} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
-#: rpmqv.c:343
+#: rpmqv.c:349
#, fuzzy, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr " [--badreloc] dosya1.rpm ... dosyaN.rpm"
-#: rpmqv.c:347
+#: rpmqv.c:353
#, fuzzy, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr " rpm {--resign} [--rcfile <dosya>] paket1 paket2 ... paketN"
-#: rpmqv.c:348
+#: rpmqv.c:354
#, fuzzy, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr " rpm {--addsign} [--rcfile <dosya>] paket1 paket2 ... paketN"
-#: rpmqv.c:349
+#: rpmqv.c:355
#, fuzzy, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr " rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
-#: rpmqv.c:393
+#: rpmqv.c:399
#, fuzzy
msgid " All modes support the following options:"
msgstr " tüm kipler aþaðýdaki argümanlarý kabul ederler:"
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
+#: rpmqv.c:402
#, fuzzy
-msgid " --eval '<name>+' "
+msgid " --eval '<expr>+' "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:398
+#: rpmqv.c:403
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "Kullanýlan RPM sürümünü verir"
+
+#: rpmqv.c:404
#, fuzzy
msgid " --pipe <cmd> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:400
+#: rpmqv.c:406
#, fuzzy
-msgid " --rcfile <file> "
+msgid " --macros <file:...> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:405
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
+
+#: rpmqv.c:411
#, fuzzy
msgid " --dbpath <dir> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:407
+#: rpmqv.c:413
#, fuzzy
msgid " --root <dir> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:417
+#: rpmqv.c:423
#, fuzzy
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
" yükleme, güncelleme ve sorgulama (-p ile) iþlemlerimde dosya isimleri "
-#: rpmqv.c:418
+#: rpmqv.c:424
#, fuzzy
msgid " of file names as well as the following options:"
msgstr " yerine FTP adreslerini aþaðýdaki seçeneklerle kabul eder:\n"
-#: rpmqv.c:419
+#: rpmqv.c:425
#, fuzzy
msgid " --ftpproxy <host> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:421
+#: rpmqv.c:427
#, fuzzy
msgid " --ftpport <port> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:423
+#: rpmqv.c:429
#, fuzzy
msgid " --httpproxy <host> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:425
+#: rpmqv.c:431
#, fuzzy
msgid " --httpport <port> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:431
+#: rpmqv.c:437
#, fuzzy
msgid " Package specification options:"
msgstr " Paket seçim seçenekleri:"
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
#, fuzzy
msgid "query/verify all packages"
msgstr "Tüm paketleri sorgulama"
-#: rpmqv.c:434
+#: rpmqv.c:440
#, fuzzy
msgid " -f <file>+ "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:435
+#: rpmqv.c:441
#, fuzzy
msgid "query/verify package owning <file>"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: rpmqv.c:436
+#: rpmqv.c:442
#, fuzzy
msgid " -p <packagefile>+ "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:437
+#: rpmqv.c:443
#, fuzzy
msgid "query/verify (uninstalled) package <packagefile>"
msgstr "(henüz yüklenmemiþ) <paket dosyasý> paketi sorgulama"
-#: rpmqv.c:438
+#: rpmqv.c:444
#, fuzzy
msgid " --triggeredby <pkg> "
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: rpmqv.c:439
+#: rpmqv.c:445
#, fuzzy
msgid "query/verify packages triggered by <pkg>"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: rpmqv.c:440
+#: rpmqv.c:446
#, fuzzy
msgid " --whatprovides <cap> "
msgstr " --requires"
-#: rpmqv.c:441
+#: rpmqv.c:447
#, fuzzy
msgid "query/verify packages which provide <cap> capability"
msgstr "<i> yeteneði olan paketleri sorgulama"
-#: rpmqv.c:442
+#: rpmqv.c:448
#, fuzzy
msgid " --whatrequires <cap> "
msgstr " --requires"
-#: rpmqv.c:443
+#: rpmqv.c:449
#, fuzzy
msgid "query/verify packages which require <cap> capability"
msgstr "<i> yeteneðine ihtiyaç duyan paketleri sorgulama"
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
#, fuzzy
msgid " Information selection options:"
msgstr " Bilgilendirme seçenekleri:"
-#: rpmqv.c:466
+#: rpmqv.c:472
#, fuzzy
msgid "list capabilities provided by package"
msgstr "paketin saðladýðý yetenekleri sýralar"
-#: rpmqv.c:468
+#: rpmqv.c:474
#, fuzzy
msgid "list capabilities required by package"
msgstr "paketin saðladýðý yetenekleri sýralar"
-#: rpmqv.c:470
+#: rpmqv.c:476
#, fuzzy
msgid "print the various [un]install scriptlets"
msgstr "paketin çeþitli yükleme, silme betiklerini (scripts) gösterir"
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
#, fuzzy
msgid " --install <packagefile>"
msgstr "paket yüklemek"
-#: rpmqv.c:497
+#: rpmqv.c:503
#, fuzzy
msgid " -i <packagefile> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:506
+#: rpmqv.c:512
#, fuzzy
msgid " --excludepath <path> "
msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
#, fuzzy
msgid "don't execute any installation scriptlets"
msgstr "yükleme betiklerini (scripts) çalýþtýrmaz."
-#: rpmqv.c:529
+#: rpmqv.c:535
#, fuzzy
msgid "don't execute any scriptlets triggered by this package"
msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-#: rpmqv.c:532
+#: rpmqv.c:538
#, fuzzy
msgid " --prefix <dir> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:534
+#: rpmqv.c:540
#, fuzzy
msgid " --relocate <oldpath>=<newpath>"
msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
-#: rpmqv.c:543
+#: rpmqv.c:549
#, fuzzy
msgid " --upgrade <packagefile>"
msgstr "paket yüklemek"
-#: rpmqv.c:544
+#: rpmqv.c:550
#, fuzzy
msgid " -U <packagefile> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:549
+#: rpmqv.c:555
#, fuzzy
msgid " --erase <package>"
msgstr "paket yüklemek"
-#: rpmqv.c:568
+#: rpmqv.c:574
#, fuzzy
msgid " -b<stage> <spec> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:569
+#: rpmqv.c:575
#, fuzzy
msgid " -t<stage> <tarball> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:584
+#: rpmqv.c:590
#, fuzzy
msgid "package src rpm only"
msgstr "pakedin adý yok :-)"
-#: rpmqv.c:595
+#: rpmqv.c:601
#, fuzzy
msgid " --buildroot <dir> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:597
+#: rpmqv.c:603
#, fuzzy
msgid " --target=<platform>+ "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:602
+#: rpmqv.c:608
#, fuzzy
msgid " --rebuild <src_pkg> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:604
+#: rpmqv.c:610
#, fuzzy
msgid " --recompile <src_pkg> "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:610
+#: rpmqv.c:616
#, fuzzy
msgid " --resign <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:612
+#: rpmqv.c:618
#, fuzzy
msgid " --addsign <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:615
+#: rpmqv.c:621
#, fuzzy
msgid " --checksig <pkg>+"
msgstr " -b<adým> <spec> "
-#: rpmqv.c:616
+#: rpmqv.c:622
#, fuzzy
msgid " -K <pkg>+ "
msgstr " -b<adým> <spec> "
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
#, fuzzy
msgid "rebuild database indices from existing database headers"
msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
-#: rpmqv.c:987
+#: rpmqv.c:924
+#, fuzzy
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr "Yerine -e veya --erase komutunu kullanýn\n"
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath veritabaný kullanýlmayan bir iþlemde belirtildi"
-#: rpmqv.c:1084
+#: rpmqv.c:1096
#, fuzzy
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr "yeniden oluþturmak için paket dosyalarý belirtilmedi"
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr "oluþturma için gerekli spec dosyasý belirtilmedi"
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr "oluþturma için gereken tar dosyalarý belirttilmedi"
@@ -1628,6 +1704,13 @@ msgstr "%s 'ye erisimde belirtilen hata oluþtu: %s\n"
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
#, fuzzy
msgid "syntax error while parsing =="
@@ -1853,15 +1936,23 @@ msgstr "%s yaratýlamýyor\n"
msgid "Processing files: %s-%s-%s\n"
msgstr "%s açýlamadý: %s"
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
+msgstr ""
+
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
+msgstr ""
+
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -3123,7 +3214,7 @@ msgstr "%s 'ye erisimde belirtilen hata oluþtu: %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "eski tip kaynak paketleri sorgulanamýyor\n"
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr "%s bir RPM paketi deðil (gibi)\n"
@@ -3188,7 +3279,7 @@ msgstr "geçersiz paket numarsý: %s\n"
msgid "record %d could not be read\n"
msgstr "%d numaralý kayýt okunamadý\n"
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr "%s pakedi yüklenmemiþ\n"
@@ -3467,107 +3558,107 @@ msgstr "%s dizinin oluþturulmasýnda hata: %s"
msgid "failed to remove directory %s: %s\n"
msgstr "%s açýlamadý: %s"
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
#, fuzzy
msgid "counting packages to install\n"
msgstr "yüklenecek paketler belirtilmedi"
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, fuzzy, c-format
msgid "found %d packages\n"
msgstr "Tüm paketleri sorgulama"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, fuzzy
msgid "looking for packages to download\n"
msgstr "%s pakedi aranýrken hata oluþtu\n"
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, fuzzy, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr "hata: %s atlanýyor - aktarým baþarýsýz - %s\n"
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr "%s alýnýyor\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hata: %s atlanýyor - aktarým baþarýsýz - %s\n"
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyasý açýlamýyor: "
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "hata: %s yüklenemedi\n"
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, fuzzy, c-format
msgid "cannot open Packages database in %s\n"
msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "%s pakedi yüklenmemiþ\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "%s dizinin oluþturulmasýnda hata: %s"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%s grubu hiç paket içermiyor\n"
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr "baðýmlýlýk hatasý, aþaðýdaki paketlere ihtiyacýnýz var:\n"
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
#, fuzzy
msgid "installing binary packages\n"
msgstr "paket yüklemek"
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr "bu paketin silinmesi aþaðýdaki baðýmlýlýklarý etkileyecektir:\n"
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "hata: %s eriþilemiyor\n"
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr "%s yükleniyor\n"
@@ -3868,101 +3959,109 @@ msgstr "FTP bilinmeyen ya da beklenmeyen hata"
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
#, fuzzy
msgid "Macro %%%.*s not found, skipping"
msgstr "%s pakedi %s içerisinde bulunamadý"
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, fuzzy, c-format
msgid "File %s: %s"
msgstr "%s açýlamadý: %s"
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
-msgstr "uyarý: "
-
-#: rpmio/rpmlog.c:92
-msgid "error: "
+#: rpmio/rpmlog.c:25
+#, fuzzy
+msgid "(no error)"
msgstr "hata: "
-#: rpmio/rpmlog.c:103
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
msgid "fatal error: "
msgstr "ölümcül hata: "
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
+msgid "error: "
+msgstr "hata: "
+
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
+msgstr "uyarý: "
+
#: rpmio/rpmmalloc.c:13
#, c-format
msgid "memory alloc (%u bytes) returned NULL.\n"
@@ -4009,6 +4108,10 @@ msgstr "%s açýlamadý: %s"
msgid "failed to create %s: %s\n"
msgstr "%s yaratýlamýyor\n"
+#, fuzzy
+#~ msgid " --rcfile <file> "
+#~ msgstr " -b<adým> <spec> "
+
#~ msgid "missing second ':' at %s:%d"
#~ msgstr "%s te ikinci ':' eksik:%d"
diff --git a/po/uk.po b/po/uk.po
index f12668c63..44fa0fd1f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/wa.po b/po/wa.po
index f12668c63..44fa0fd1f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/zh.po b/po/zh.po
index f12668c63..44fa0fd1f 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index f12668c63..44fa0fd1f 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\n"
-"POT-Creation-Date: 2000-08-30 22:29-0400\n"
+"POT-Creation-Date: 2000-09-01 17:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: build.c:25 lib/rpminstall.c:459
+#: build.c:25 lib/rpminstall.c:460
#, c-format
msgid "cannot open %s/packages.rpm\n"
msgstr ""
@@ -28,1045 +28,1058 @@ msgstr ""
msgid "Unable to open spec file %s: %s\n"
msgstr ""
-#: build.c:126 build.c:139
+#: build.c:126 build.c:138
#, c-format
-msgid "Failed to open tar pipe: %s\n"
+msgid "Failed to open tar pipe: %m"
msgstr ""
#. Give up
-#: build.c:147
+#: build.c:145
#, c-format
-msgid "Failed to read spec file from %s\n"
+msgid "Failed to read spec file from %s"
msgstr ""
-#: build.c:174
+#: build.c:172
#, c-format
-msgid "Failed to rename %s to %s: %s\n"
+msgid "Failed to rename %s to %s: %m"
msgstr ""
-#: build.c:214
+#: build.c:211
#, c-format
-msgid "File is not a regular file: %s\n"
+msgid "failed to stat %s: %m"
msgstr ""
-#: build.c:221
+#: build.c:216
#, c-format
-msgid "File %s does not appear to be a specfile.\n"
+msgid "File %s is not a regular file."
+msgstr ""
+
+#: build.c:224
+#, c-format
+msgid "File %s does not appear to be a specfile."
msgstr ""
#. parse up the build operators
-#: build.c:282
+#: build.c:285
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: build.c:297
+#: build.c:300
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpm.c:178 rpmqv.c:257
+#: rpm.c:180 rpmqv.c:263
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:189 rpmqv.c:268
+#: rpm.c:191 rpmqv.c:274
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:193 rpmqv.c:272
+#: rpm.c:195 rpmqv.c:278
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:194 rpmqv.c:273
+#: rpm.c:196 rpmqv.c:279
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:202
+#: rpm.c:204
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:206 rpmqv.c:294
+#: rpm.c:208 rpmqv.c:300
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:207 rpmqv.c:295
+#: rpm.c:209 rpmqv.c:301
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:208 rpmqv.c:296
+#: rpm.c:210
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:209 rpmqv.c:297
+#: rpm.c:211 rpmqv.c:303
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:210 rpm.c:219 rpm.c:229 rpmqv.c:298 rpmqv.c:307 rpmqv.c:323
+#: rpm.c:212 rpm.c:221 rpm.c:231 rpmqv.c:304 rpmqv.c:313 rpmqv.c:329
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:211 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:324
+#: rpm.c:213 rpm.c:232 rpmqv.c:305 rpmqv.c:314 rpmqv.c:330
msgid " [--httpproxy <host>] [--httpport <port>]"
msgstr ""
-#: rpm.c:212 rpmqv.c:300
+#: rpm.c:214 rpmqv.c:306
msgid ""
" [--justdb] [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:213 rpmqv.c:301
+#: rpm.c:215 rpmqv.c:307
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:214 rpmqv.c:302
+#: rpm.c:216 rpmqv.c:308
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:215
+#: rpm.c:217
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:216 rpmqv.c:304
+#: rpm.c:218 rpmqv.c:310
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:217 rpmqv.c:305
+#: rpm.c:219
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:218 rpmqv.c:306
+#: rpm.c:220 rpmqv.c:312
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220
+#: rpm.c:222
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:221 rpmqv.c:309
+#: rpm.c:223 rpmqv.c:315
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:222 rpmqv.c:310
+#: rpm.c:224 rpmqv.c:316
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:223 rpmqv.c:311
+#: rpm.c:225 rpmqv.c:317
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:224 rpmqv.c:312
+#: rpm.c:226 rpmqv.c:318
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:225
+#: rpm.c:227
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:226 rpmqv.c:320
+#: rpm.c:228
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:227 rpmqv.c:321
+#: rpm.c:229 rpmqv.c:327
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:228 rpmqv.c:322
+#: rpm.c:230 rpmqv.c:328
msgid " [--triggeredby]"
msgstr ""
-#: rpm.c:231 rpmqv.c:325
+#: rpm.c:233 rpmqv.c:331
msgid " [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:326
+#: rpm.c:234 rpmqv.c:332
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:328
+#: rpm.c:236 rpmqv.c:334
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:329
+#: rpm.c:237 rpmqv.c:335
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:320
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:321
msgid " [--justdb] [--notriggers] package1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:244
+#: rpm.c:246
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:245 rpmqv.c:350
+#: rpm.c:247 rpmqv.c:356
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:281 rpmqv.c:386
+#: rpm.c:283 rpmqv.c:392
msgid "Usage:"
msgstr ""
-#: rpm.c:283 rpmqv.c:388
+#: rpm.c:285 rpmqv.c:394
msgid "print this message"
msgstr ""
-#: rpm.c:285 rpmqv.c:390
+#: rpm.c:287 rpmqv.c:396
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:288
+#: rpm.c:290
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:289
+#: rpm.c:291
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:290 rpmqv.c:395
+#: rpm.c:292 rpmqv.c:152 rpmqv.c:401
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:291
+#: rpm.c:293
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:292 rpmqv.c:397
+#: rpm.c:294
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:293
+#: rpm.c:295
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:294 rpmqv.c:399
+#: rpm.c:296 rpmqv.c:405
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:296 rpmqv.c:401
+#: rpm.c:298
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:298 rpmqv.c:403
+#: rpm.c:300 rpmqv.c:409
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:300 rpmqv.c:411
+#: rpm.c:302 rpmqv.c:417
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:302 rpmqv.c:413
+#: rpm.c:304 rpmqv.c:419
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:305
+#: rpm.c:307
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:306
+#: rpm.c:308
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:307
+#: rpm.c:309
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:308 rpmqv.c:420
+#: rpm.c:310 rpmqv.c:426
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:309
+#: rpm.c:311
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:310 rpmqv.c:422
+#: rpm.c:312 rpmqv.c:428
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:311
+#: rpm.c:313
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:312 rpmqv.c:424
+#: rpm.c:314 rpmqv.c:430
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:314 rpmqv.c:426
+#: rpm.c:316 rpmqv.c:432
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:318 rpmqv.c:446
+#: rpm.c:320 rpmqv.c:452
msgid "query mode"
msgstr ""
-#: rpm.c:319 rpm.c:365 rpm.c:390 rpm.c:442 rpm.c:516
+#: rpm.c:321 rpm.c:367 rpm.c:392 rpm.c:444 rpm.c:518
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:320 rpm.c:366 rpm.c:391 rpm.c:443 rpm.c:517 rpmqv.c:406
+#: rpm.c:322 rpm.c:368 rpm.c:393 rpm.c:445 rpm.c:519 rpmqv.c:412
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:321
+#: rpm.c:323
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:322 rpmqv.c:448
+#: rpm.c:324 rpmqv.c:454
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:323 rpm.c:367 rpm.c:425 rpm.c:454
+#: rpm.c:325 rpm.c:369 rpm.c:427 rpm.c:456
msgid " --root <dir> "
msgstr ""
-#: rpm.c:324 rpm.c:368 rpm.c:426 rpm.c:455 rpm.c:519 rpmqv.c:408
+#: rpm.c:326 rpm.c:370 rpm.c:428 rpm.c:457 rpm.c:521 rpmqv.c:414
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:325
+#: rpm.c:327
msgid " Package specification options:"
msgstr ""
-#: rpm.c:327
+#: rpm.c:329
msgid "query all packages"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:329
+#: rpm.c:331
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:330
+#: rpm.c:332
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:331
+#: rpm.c:333
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:333
+#: rpm.c:335
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid " Information selection options:"
msgstr ""
-#: rpm.c:340 rpmqv.c:452
+#: rpm.c:342 rpmqv.c:458
msgid "display package information"
msgstr ""
-#: rpm.c:342 rpmqv.c:454
+#: rpm.c:344 rpmqv.c:460
msgid "display the package's change log"
msgstr ""
-#: rpm.c:344 rpmqv.c:456
+#: rpm.c:346 rpmqv.c:462
msgid "display package file list"
msgstr ""
-#: rpm.c:346 rpmqv.c:458
+#: rpm.c:348 rpmqv.c:464
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:348 rpmqv.c:460
+#: rpm.c:350 rpmqv.c:466
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:350 rpmqv.c:462
+#: rpm.c:352 rpmqv.c:468
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:352 rpmqv.c:464
+#: rpm.c:354 rpmqv.c:470
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:354
+#: rpm.c:356
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:356
+#: rpm.c:358
msgid "list package dependencies"
msgstr ""
-#: rpm.c:358
+#: rpm.c:360
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:360
+#: rpm.c:362
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:364 rpmqv.c:475
+#: rpm.c:366 rpmqv.c:481
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:370 rpm.c:412 rpm.c:447 rpmqv.c:477 rpmqv.c:523 rpmqv.c:557
+#: rpm.c:372 rpm.c:414 rpm.c:449 rpmqv.c:483 rpmqv.c:529 rpmqv.c:563
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:372 rpmqv.c:479
+#: rpm.c:374 rpmqv.c:485
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:374 rpmqv.c:481
+#: rpm.c:376 rpmqv.c:487
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:376 rpmqv.c:484
+#: rpm.c:378 rpmqv.c:490
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:379
+#: rpm.c:381
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:380
+#: rpm.c:382
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:381 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:504
msgid "install package"
msgstr ""
-#: rpm.c:382
+#: rpm.c:384
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:383
+#: rpm.c:385
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:384
+#: rpm.c:386
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:385 rpmqv.c:535
+#: rpm.c:387 rpmqv.c:541
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:387 rpmqv.c:503
+#: rpm.c:389 rpmqv.c:509
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:388
+#: rpm.c:390
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:389 rpmqv.c:533
+#: rpm.c:391 rpmqv.c:539
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:393 rpmqv.c:505
+#: rpm.c:395 rpmqv.c:511
msgid "do not install documentation"
msgstr ""
-#: rpm.c:395 rpmqv.c:509
+#: rpm.c:397 rpmqv.c:515
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:397 rpmqv.c:511
+#: rpm.c:399 rpmqv.c:517
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:399 rpmqv.c:500
+#: rpm.c:401 rpmqv.c:506
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:402 rpmqv.c:513
+#: rpm.c:404 rpmqv.c:519
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:404 rpmqv.c:515
+#: rpm.c:406 rpmqv.c:521
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:406 rpmqv.c:517
+#: rpm.c:408 rpmqv.c:523
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:408 rpmqv.c:519
+#: rpm.c:410 rpmqv.c:525
msgid "install documentation"
msgstr ""
-#: rpm.c:410 rpm.c:445 rpmqv.c:521 rpmqv.c:555
+#: rpm.c:412 rpm.c:447 rpmqv.c:527 rpmqv.c:561
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:414 rpm.c:449 rpmqv.c:525 rpmqv.c:559
+#: rpm.c:416 rpm.c:451 rpmqv.c:531 rpmqv.c:565
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:416
+#: rpm.c:418
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:418 rpm.c:453 rpmqv.c:563
+#: rpm.c:420 rpm.c:455 rpmqv.c:569
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:420 rpmqv.c:531
+#: rpm.c:422 rpmqv.c:537
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:422 rpmqv.c:537
+#: rpm.c:424 rpmqv.c:543
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:424 rpmqv.c:539
+#: rpm.c:426 rpmqv.c:545
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:428 rpmqv.c:541
+#: rpm.c:430 rpmqv.c:547
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:431
+#: rpm.c:433
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:432
+#: rpm.c:434
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:433 rpmqv.c:545
+#: rpm.c:435 rpmqv.c:551
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:435 rpmqv.c:547
+#: rpm.c:437 rpmqv.c:553
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:437
+#: rpm.c:439
msgid " --erase <package>"
msgstr ""
-#: rpm.c:439 rpmqv.c:551
+#: rpm.c:441 rpmqv.c:557
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:441 rpmqv.c:553
+#: rpm.c:443 rpmqv.c:559
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:451 rpmqv.c:561
+#: rpm.c:453 rpmqv.c:567
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:457
+#: rpm.c:459
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:458
+#: rpm.c:460
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:459 rpmqv.c:570
+#: rpm.c:461 rpmqv.c:576
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:461 rpmqv.c:572
+#: rpm.c:463 rpmqv.c:578
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:463 rpmqv.c:574
+#: rpm.c:465 rpmqv.c:580
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:465 rpmqv.c:576
+#: rpm.c:467 rpmqv.c:582
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:467 rpmqv.c:578
+#: rpm.c:469 rpmqv.c:584
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:469 rpmqv.c:580
+#: rpm.c:471 rpmqv.c:586
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:471 rpmqv.c:582
+#: rpm.c:473 rpmqv.c:588
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:156 rpm.c:473 rpmqv.c:586
+#: lib/poptBT.c:156 rpm.c:475 rpmqv.c:592
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:146 rpm.c:475 rpmqv.c:588
+#: lib/poptBT.c:146 rpm.c:477 rpmqv.c:594
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:152 rpm.c:477 rpmqv.c:590
+#: lib/poptBT.c:152 rpm.c:479 rpmqv.c:596
msgid "remove sources when done"
msgstr ""
-#: rpm.c:479 rpmqv.c:592
+#: rpm.c:481 rpmqv.c:598
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:481 rpmqv.c:594
+#: rpm.c:483 rpmqv.c:600
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:482
+#: rpm.c:484
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:483 rpmqv.c:596
+#: rpm.c:485 rpmqv.c:602
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:484
+#: rpm.c:486
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:485 rpmqv.c:598
+#: rpm.c:487 rpmqv.c:604
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:487 rpmqv.c:600
+#: rpm.c:489 rpmqv.c:606
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:488
+#: rpm.c:490
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:492 rpmqv.c:603
+#: rpm.c:494 rpmqv.c:609
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:493
+#: rpm.c:495
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:494 rpmqv.c:605
+#: rpm.c:496 rpmqv.c:611
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:497
+#: rpm.c:499
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:498 rpmqv.c:611
+#: rpm.c:500 rpmqv.c:617
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:499
+#: rpm.c:501
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:500 rpmqv.c:613
+#: rpm.c:502 rpmqv.c:619
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:501
+#: rpm.c:503
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:502
+#: rpm.c:504
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:503 rpmqv.c:617
+#: rpm.c:505 rpmqv.c:623
msgid "verify package signature"
msgstr ""
-#: rpm.c:505 rpmqv.c:619
+#: rpm.c:507 rpmqv.c:625
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:507 rpmqv.c:621
+#: rpm.c:509 rpmqv.c:627
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:509 rpmqv.c:623
+#: rpm.c:511 rpmqv.c:629
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:513
+#: rpm.c:515
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:515
+#: rpm.c:517
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:523 rpmqv.c:486
+#: rpm.c:525 rpmqv.c:492
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:526 rpmqv.c:489
+#: rpm.c:528 rpmqv.c:495
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:664 rpm.c:670 rpm.c:679 rpm.c:701 rpm.c:707 rpm.c:714 rpm.c:722
-#: rpm.c:730 rpm.c:751 rpm.c:808 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
-#: rpmqv.c:832 rpmqv.c:839 rpmqv.c:874 rpmqv.c:882 rpmqv.c:888 rpmqv.c:896
-#: rpmqv.c:958
+#: rpm.c:666 rpm.c:672 rpm.c:681 rpm.c:703 rpm.c:709 rpm.c:716 rpm.c:724
+#: rpm.c:732 rpm.c:753 rpm.c:816 rpmqv.c:817 rpmqv.c:826 rpmqv.c:832
+#: rpmqv.c:838 rpmqv.c:845 rpmqv.c:880 rpmqv.c:888 rpmqv.c:894 rpmqv.c:902
+#: rpmqv.c:970
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:672 rpmqv.c:813
+#: rpm.c:674 rpmqv.c:819
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:674 rpmqv.c:815
+#: rpm.c:676 rpmqv.c:821
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:757 rpmqv.c:858
+#: rpm.c:759 rpmqv.c:864
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:759 rpmqv.c:860
+#: rpm.c:761 rpmqv.c:866
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:762 rpmqv.c:863
+#: rpm.c:764 rpmqv.c:869
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:771 rpmqv.c:847
+#: rpm.c:773 rpmqv.c:853
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:780 rpmqv.c:917
+#: rpm.c:782 rpmqv.c:923
+msgid "The --rcfile option has been eliminated.\n"
+msgstr ""
+
+#: rpm.c:783
+msgid "Use --macros with a colon separated list of macro files to read.\n"
+msgstr ""
+
+#: rpm.c:788 rpmqv.c:929
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:815 rpmqv.c:973
+#: rpm.c:823 rpmqv.c:985
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:820 rpmqv.c:977
+#: rpm.c:828 rpmqv.c:989
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:823 rpmqv.c:980
+#: rpm.c:831 rpmqv.c:992
msgid "unexpected query format"
msgstr ""
-#: rpm.c:826 rpmqv.c:983
+#: rpm.c:834 rpmqv.c:995
msgid "unexpected query source"
msgstr ""
-#: rpm.c:829 rpmqv.c:1003
+#: rpm.c:837 rpmqv.c:1015
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:832 rpmqv.c:1008
+#: rpm.c:840 rpmqv.c:1020
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:835 rpmqv.c:1011
+#: rpm.c:843 rpmqv.c:1023
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:838 rpmqv.c:1014
+#: rpm.c:846 rpmqv.c:1026
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:841 rpmqv.c:1017
+#: rpm.c:849 rpmqv.c:1029
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:844 rpmqv.c:1020
+#: rpm.c:852 rpmqv.c:1032
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:847 rpmqv.c:1023
+#: rpm.c:855 rpmqv.c:1035
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:851 rpmqv.c:1027
+#: rpm.c:859 rpmqv.c:1039
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:855 rpmqv.c:1031
+#: rpm.c:863 rpmqv.c:1043
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:859 rpmqv.c:1035
+#: rpm.c:867 rpmqv.c:1047
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:863 rpmqv.c:1039
+#: rpm.c:871 rpmqv.c:1051
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:867 rpmqv.c:1043
+#: rpm.c:875 rpmqv.c:1055
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:871 rpmqv.c:1047
+#: rpm.c:879 rpmqv.c:1059
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:875 rpmqv.c:1051
+#: rpm.c:883 rpmqv.c:1063
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:879 rpmqv.c:1055
+#: rpm.c:887 rpmqv.c:1067
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:883 rpmqv.c:1059
+#: rpm.c:891 rpmqv.c:1071
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:887 rpmqv.c:1063
+#: rpm.c:895 rpmqv.c:1075
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:891 rpmqv.c:1067
+#: rpm.c:899 rpmqv.c:1079
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:895 rpmqv.c:1071
+#: rpm.c:903 rpmqv.c:1083
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:900 rpmqv.c:1078
+#: rpm.c:908 rpmqv.c:1090
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:904
+#: rpm.c:912
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:908 rpmqv.c:1090
+#: rpm.c:916 rpmqv.c:1102
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:913 rpmqv.c:1095
+#: rpm.c:921 rpmqv.c:1107
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:917 rpmqv.c:1100
+#: rpm.c:925 rpmqv.c:1112
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:929 rpmqv.c:1112
+#: rpm.c:937 rpmqv.c:1124
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:935 rpmqv.c:1119
+#: rpm.c:943 rpmqv.c:1131
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:938 rpmqv.c:1124
+#: rpm.c:946 rpmqv.c:1136
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:941 rpmqv.c:1127
+#: rpm.c:949 rpmqv.c:1139
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:944 rpmqv.c:1132
+#: rpm.c:952 rpmqv.c:1144
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:955 rpmqv.c:1145
+#: rpm.c:963 rpmqv.c:1157
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:960 rpmqv.c:1150
+#: rpm.c:968 rpmqv.c:1162
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:975 rpmqv.c:1166
+#: rpm.c:983 rpmqv.c:1178
msgid "pgp not found: "
msgstr ""
-#: rpm.c:979 rpmqv.c:1170
+#: rpm.c:987 rpmqv.c:1182
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:981 rpmqv.c:1172
+#: rpm.c:989 rpmqv.c:1184
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:984 rpmqv.c:1175
+#: rpm.c:992 rpmqv.c:1187
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:989 rpmqv.c:1180
+#: rpm.c:997 rpmqv.c:1192
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:995 rpmqv.c:1186
+#: rpm.c:1003 rpmqv.c:1198
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1010 rpmqv.c:1202
+#: rpm.c:1018 rpmqv.c:1214
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1029 rpmqv.c:1471
+#: rpm.c:1037 rpmqv.c:1483
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1040 rpmqv.c:1493
+#: rpm.c:1048 rpmqv.c:1505
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1051 rpmqv.c:1504
+#: rpm.c:1059 rpmqv.c:1516
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1067 rpmqv.c:1343
+#: rpm.c:1075 rpmqv.c:1355
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1118 rpmqv.c:1394
+#: rpm.c:1126 rpmqv.c:1406
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1141 rpmqv.c:1434
+#: rpm.c:1149 rpmqv.c:1446
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1146 rpmqv.c:1439
+#: rpm.c:1154 rpmqv.c:1451
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1163 rpmqv.c:1459
+#: rpm.c:1171 rpmqv.c:1471
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1167 rpmqv.c:1463
+#: rpm.c:1175 rpmqv.c:1475
msgid "no arguments given for verify"
msgstr ""
@@ -1088,339 +1101,393 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:152
+msgid "'<name> <body>'"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "print macro expansion to stdout"
+msgstr ""
+
+#: rpmqv.c:154
+msgid "<expr>+"
+msgstr ""
+
+#: rpmqv.c:179
+msgid "read <file:...> instead of default macro file(s)"
+msgstr ""
+
+#: rpmqv.c:180
+msgid "<file:...>"
+msgstr ""
+
+#: rpmqv.c:290
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:294
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:295
#, c-format
-msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid " %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:299
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:302
+msgid ""
+" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:311
+msgid ""
+" [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:319
#, c-format
-msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:326
+msgid ""
+" [--scripts] [--root <dir>] [--macros <file:...>]"
msgstr ""
-#: rpmqv.c:327
+#: rpmqv.c:333
#, c-format
-msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:337
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:332
+#: rpmqv.c:338
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:342
#, c-format
msgid ""
-" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<file>]\n"
+" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:338
+#: rpmqv.c:344
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:345
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:346
#, c-format
-msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid " %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:347
#, c-format
msgid ""
-" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:348
#, c-format
msgid ""
-" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:343
+#: rpmqv.c:349
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:353
#, c-format
-msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:354
#, c-format
-msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:349
+#: rpmqv.c:355
#, c-format
msgid ""
-" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:399
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:394
+#: rpmqv.c:400
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:396
-msgid " --eval '<name>+' "
+#: rpmqv.c:402
+msgid " --eval '<expr>+' "
+msgstr ""
+
+#: rpmqv.c:403
+msgid "print the expansion of macro <expr> to stdout"
msgstr ""
-#: rpmqv.c:398
+#: rpmqv.c:404
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:400
-msgid " --rcfile <file> "
+#: rpmqv.c:406
+msgid " --macros <file:...> "
+msgstr ""
+
+#: rpmqv.c:407
+msgid "use <file:...> instead of default list of macro files"
msgstr ""
-#: rpmqv.c:405
+#: rpmqv.c:411
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:407
+#: rpmqv.c:413
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:423
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:424
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:419
+#: rpmqv.c:425
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:421
+#: rpmqv.c:427
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:423
+#: rpmqv.c:429
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:425
+#: rpmqv.c:431
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:431
+#: rpmqv.c:437
msgid " Package specification options:"
msgstr ""
-#: lib/poptQV.c:66 rpmqv.c:433
+#: lib/poptQV.c:66 rpmqv.c:439
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:440
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:441
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:442
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:443
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:444
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:445
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:446
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:447
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:448
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:443
+#: rpmqv.c:449
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:447
+#: rpmqv.c:453
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:450
+#: rpmqv.c:456
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:466
+#: rpmqv.c:472
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:468
+#: rpmqv.c:474
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:470
+#: rpmqv.c:476
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:472
+#: rpmqv.c:478
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:502
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:497
+#: rpmqv.c:503
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:512
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:507
+#: rpmqv.c:513
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:527
+#: rpmqv.c:533
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:529
+#: rpmqv.c:535
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:532
+#: rpmqv.c:538
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:534
+#: rpmqv.c:540
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:549
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:544
+#: rpmqv.c:550
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:549
+#: rpmqv.c:555
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:574
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:569
+#: rpmqv.c:575
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:584
+#: rpmqv.c:590
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:595
+#: rpmqv.c:601
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:597
+#: rpmqv.c:603
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:602
+#: rpmqv.c:608
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:604
+#: rpmqv.c:610
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:616
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:612
+#: rpmqv.c:618
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:621
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:616
+#: rpmqv.c:622
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:629
+#: rpmqv.c:635
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:631
+#: rpmqv.c:637
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:987
+#: rpmqv.c:924
+msgid "Use \"--macros <file:...>\" instead..\n"
+msgstr ""
+
+#: rpmqv.c:999
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1084
+#: rpmqv.c:1096
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1242
+#: rpmqv.c:1254
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1311
+#: rpmqv.c:1323
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1313
+#: rpmqv.c:1325
msgid "no tar files given for build"
msgstr ""
@@ -1443,6 +1510,13 @@ msgstr ""
msgid "Bad exit status from %s (%s)"
msgstr ""
+#: build/build.c:303
+msgid ""
+"\n"
+"\n"
+"RPM build errors:\n"
+msgstr ""
+
#: build/expression.c:207
msgid "syntax error while parsing =="
msgstr ""
@@ -1662,15 +1736,23 @@ msgstr ""
msgid "Processing files: %s-%s-%s\n"
msgstr ""
-#: build/names.c:47 build/names.c:80
-msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
+#: build/names.c:41
+msgid "getUname: too many uid's\n"
msgstr ""
-#: build/names.c:114 build/names.c:147
-msgid "RPMERR_INTERNAL: Hit limit in getGname()\n"
+#: build/names.c:67
+msgid "getUnameS: too many uid's\n"
msgstr ""
-#: build/names.c:187
+#: build/names.c:94
+msgid "getGname: too many gid's\n"
+msgstr ""
+
+#: build/names.c:120
+msgid "getGnameS: too many gid's\n"
+msgstr ""
+
+#: build/names.c:154
#, c-format
msgid "Could not canonicalize hostname: %s\n"
msgstr ""
@@ -2886,7 +2968,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:523 lib/rpminstall.c:241
+#: lib/query.c:523 lib/rpminstall.c:242
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
@@ -2950,7 +3032,7 @@ msgstr ""
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:701 lib/rpminstall.c:472
+#: lib/query.c:701 lib/rpminstall.c:473
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3227,104 +3309,104 @@ msgstr ""
msgid "failed to remove directory %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:135
+#: lib/rpminstall.c:136
msgid "counting packages to install\n"
msgstr ""
-#: lib/rpminstall.c:139
+#: lib/rpminstall.c:140
#, c-format
msgid "found %d packages\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
msgid "looking for packages to download\n"
msgstr ""
-#: lib/rpminstall.c:159
+#: lib/rpminstall.c:160
#, c-format
msgid "skipping %s - rpmGlob failed(%d)\n"
msgstr ""
-#: lib/rpminstall.c:174
+#: lib/rpminstall.c:175
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:184
+#: lib/rpminstall.c:185
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:188
+#: lib/rpminstall.c:189
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:215
+#: lib/rpminstall.c:216
#, c-format
msgid "retrieved %d packages\n"
msgstr ""
-#: lib/rpminstall.c:227 lib/rpminstall.c:396
+#: lib/rpminstall.c:228 lib/rpminstall.c:397
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:245 lib/rpminstall.c:537
+#: lib/rpminstall.c:246 lib/rpminstall.c:538
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:260
+#: lib/rpminstall.c:261
#, c-format
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpminstall.c:280
+#: lib/rpminstall.c:281
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:326
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:347
+#: lib/rpminstall.c:348
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:358
+#: lib/rpminstall.c:359
msgid "failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:376
+#: lib/rpminstall.c:377
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:475
+#: lib/rpminstall.c:476
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:499
msgid "removing these packages would break dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:526
+#: lib/rpminstall.c:527
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3604,98 +3686,105 @@ msgstr ""
msgid "logging into %s as %s, pw %s\n"
msgstr ""
-#: rpmio/macro.c:166
+#: rpmio/macro.c:169
#, c-format
msgid "======================== active %d empty %d\n"
msgstr ""
#. XXX just in case
-#: rpmio/macro.c:261
+#: rpmio/macro.c:264
#, c-format
msgid "%3d>%*s(empty)"
msgstr ""
-#: rpmio/macro.c:296
+#: rpmio/macro.c:299
#, c-format
msgid "%3d<%*s(empty)\n"
msgstr ""
-#: rpmio/macro.c:475
+#: rpmio/macro.c:478
msgid "Macro %%%s has unterminated body"
msgstr ""
-#: rpmio/macro.c:501
+#: rpmio/macro.c:504
msgid "Macro %%%s has illegal name (%%define)"
msgstr ""
-#: rpmio/macro.c:507
+#: rpmio/macro.c:510
msgid "Macro %%%s has unterminated opts"
msgstr ""
-#: rpmio/macro.c:512
+#: rpmio/macro.c:515
msgid "Macro %%%s has empty body"
msgstr ""
-#: rpmio/macro.c:517
+#: rpmio/macro.c:520
msgid "Macro %%%s failed to expand"
msgstr ""
-#: rpmio/macro.c:542
+#: rpmio/macro.c:545
msgid "Macro %%%s has illegal name (%%undefine)"
msgstr ""
-#: rpmio/macro.c:619
+#: rpmio/macro.c:622
msgid "Macro %%%s (%s) was not used below level %d"
msgstr ""
-#: rpmio/macro.c:703
+#: rpmio/macro.c:706
#, c-format
msgid "Unknown option %c in %s(%s)"
msgstr ""
-#: rpmio/macro.c:859
+#: rpmio/macro.c:864
#, c-format
msgid "Recursion depth(%d) greater than max(%d)"
msgstr ""
-#: rpmio/macro.c:925 rpmio/macro.c:941
+#: rpmio/macro.c:930 rpmio/macro.c:946
#, c-format
msgid "Unterminated %c: %s"
msgstr ""
-#: rpmio/macro.c:981
+#: rpmio/macro.c:986
msgid "A %% is followed by an unparseable macro"
msgstr ""
-#: rpmio/macro.c:1107
+#: rpmio/macro.c:1112
msgid "Macro %%%.*s not found, skipping"
msgstr ""
-#: rpmio/macro.c:1188
+#: rpmio/macro.c:1193
msgid "Target buffer overflow"
msgstr ""
#. XXX Fstrerror
-#: rpmio/macro.c:1368 rpmio/macro.c:1374
+#: rpmio/macro.c:1373 rpmio/macro.c:1379
#, c-format
msgid "File %s: %s"
msgstr ""
-#: rpmio/macro.c:1377
+#: rpmio/macro.c:1382
#, c-format
msgid "File %s is smaller than %d bytes"
msgstr ""
-#: rpmio/rpmlog.c:83
-msgid "warning: "
+#: rpmio/rpmlog.c:25
+msgid "(no error)"
msgstr ""
-#: rpmio/rpmlog.c:92
+#. !< RPMLOG_EMERG
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
+msgid "fatal error: "
+msgstr ""
+
+#. !< RPMLOG_CRIT
+#: rpmio/rpmlog.c:86
msgid "error: "
msgstr ""
-#: rpmio/rpmlog.c:103
-msgid "fatal error: "
+#. !< RPMLOG_ERR
+#: rpmio/rpmlog.c:87
+msgid "warning: "
msgstr ""
#: rpmio/rpmmalloc.c:13
diff --git a/rpm.c b/rpm.c
index e9d109291..89165926b 100755
--- a/rpm.c
+++ b/rpm.c
@@ -17,6 +17,7 @@
#define GETOPT_EXCLUDEPATH 1019
#define GETOPT_DEFINEMACRO 1020
#define GETOPT_EVALMACRO 1021
+#define GETOPT_RCFILE 1022
enum modes {
MODE_UNKNOWN = 0,
@@ -123,6 +124,7 @@ static struct poptOption optionsTable[] = {
/* info and install both using 'i' is dumb */
{ "install", '\0', 0, 0, GETOPT_INSTALL, NULL, NULL},
{ "justdb", '\0', 0, &justdb, 0, NULL, NULL},
+ { "macros", '\0', POPT_ARG_STRING, &macrofiles, 0, NULL, NULL},
{ "nodeps", '\0', 0, &noDeps, 0, NULL, NULL},
{ "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1, NULL, NULL},
{ "nogpg", '\0', 0, &noGpg, 0, NULL, NULL},
@@ -139,7 +141,7 @@ static struct poptOption optionsTable[] = {
{ "pipe", '\0', POPT_ARG_STRING, &pipeOutput, 0, NULL, NULL},
{ "prefix", '\0', POPT_ARG_STRING, &prefix, 0, NULL, NULL},
{ "quiet", '\0', 0, &quiet, 0, NULL, NULL},
- { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0, NULL, NULL},
+ { "rcfile", '\0', 0, 0, GETOPT_RCFILE, NULL, NULL},
{ "rebuilddb", '\0', 0, 0, GETOPT_REBUILDDB, NULL, NULL},
{ "relocate", '\0', POPT_ARG_STRING, 0, GETOPT_RELOCATE, NULL, NULL},
{ "replacefiles", '\0', 0, &replaceFiles, 0, NULL, NULL},
@@ -776,6 +778,12 @@ int main(int argc, const char ** argv)
relocations[numRelocations++].newPath = NULL;
break;
+ case GETOPT_RCFILE:
+ fprintf(stderr, _("The --rcfile option has been eliminated.\n"));
+ fprintf(stderr, _("Use --macros with a colon separated list of macro files to read.\n"));
+ exit(EXIT_FAILURE);
+ /*@notreached@*/ break;
+
default:
fprintf(stderr, _("Internal error in argument processing (%d) :-(\n"), arg);
exit(EXIT_FAILURE);
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 254f1d33f..2a268d90f 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -55,14 +55,17 @@ typedef FILE * FD_t;
struct MacroContext rpmGlobalMacroContext;
struct MacroContext rpmCLIMacroContext;
+/**
+ * Macro expansion data structure.
+ */
typedef struct MacroBuf {
- const char *s; /* text to expand */
- char *t; /* expansion buffer */
- size_t nb; /* no. bytes remaining in expansion buffer */
- int depth; /* current expansion depth */
- int macro_trace; /* pre-print macro to expand? */
- int expand_trace; /* post-print macro expansion? */
- void *spec; /* (future) %file expansion info */
+ const char *s; /*!< Text to expand. */
+ char *t; /*!< Expansion buffer. */
+ size_t nb; /*!< No. bytes remaining in expansion buffer. */
+ int depth; /*!< Current expansion depth. */
+ int macro_trace; /*!< Pre-print macro to expand? */
+ int expand_trace; /*!< Post-print macro expansion? */
+ void *spec; /*!< (future) %file expansion info. */
MacroContext *mc;
} MacroBuf;
@@ -837,8 +840,10 @@ doFoo(MacroBuf *mb, int negate, const char *f, size_t fn, const char *g, size_t
}
}
-/* The main recursion engine */
-
+/**
+ * The main recursion engine.
+ * @todo Dynamically reallocate target buffer.
+ */
static int
expandMacro(MacroBuf *mb)
{
diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h
index 17b554731..4350f02ec 100644
--- a/rpmio/rpmerr.h
+++ b/rpmio/rpmerr.h
@@ -60,7 +60,7 @@ typedef enum rpmerrCode_e {
RPMERR_UNMATCHEDIF = _em(107), /*!< unclosed %ifarch or %ifos */
RPMERR_BADARG = _em(109), /*!< @todo Document. */
RPMERR_SCRIPT = _em(110), /*!< errors related to script exec */
- RPMERR_READERROR = _em(111), /*!< @todo Document. */
+ RPMERR_READ = _em(111), /*!< @todo Document. */
RPMERR_UNKNOWNOS = _em(112), /*!< @todo Document. */
RPMERR_UNKNOWNARCH = _em(113), /*!< @todo Document. */
RPMERR_EXEC = _em(114), /*!< @todo Document. */
@@ -70,6 +70,9 @@ typedef enum rpmerrCode_e {
RPMERR_BADSPEC = _em(118), /*!< @todo Document. */
RPMERR_LDD = _em(119), /*!< couldn't understand ldd output */
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_BADSIGTYPE = _em(200), /*!< Unknown signature type */
RPMERR_SIGGEN = _em(201) /*!< Error generating signature */
@@ -78,6 +81,10 @@ typedef enum rpmerrCode_e {
/**
* Retrofit rpmError() onto rpmlog sub-system.
*/
-#define rpmError rpmlog
+#define rpmError rpmlog
+#define rpmErrorString() rpmlogMessage()
+#define rpmErrorSetCallback(_cb) rpmlogSetCallback(_cb)
+typedef rpmlogCallback rpmErrorCallBackType;
+
#endif /* H_RPMERR */
diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
index 0670db152..f04cd06c7 100644
--- a/rpmio/rpmmacro.h
+++ b/rpmio/rpmmacro.h
@@ -39,32 +39,75 @@ typedef /*@abstract@*/ struct MacroContext {
extern "C" {
#endif
+/**
+ */
void rpmDumpMacroTable (MacroContext * mc, FILE * fp);
-/* XXX this is used only in build/expression.c and will go away. */
+/**
+ * @deprecated Used only in build/expression.c.
+ * @todo Eliminate.
+ */
const char *getMacroBody (MacroContext *mc, const char *name);
+/**
+ * @deprecated Use rpmExpand().
+ * @todo Eliminate from API.
+ */
int expandMacros (void * spec, MacroContext * mc, char * sbuf,
size_t sbuflen);
+
+/**
+ */
void addMacro (MacroContext * mc, const char * n, const char * o,
const char * b, int depth);
+
+/**
+ */
void delMacro (MacroContext * mc, const char * n);
+/**
+ */
int rpmDefineMacro (MacroContext * mc, const char * macro, int level);
+
+/**
+ */
void rpmLoadMacros (MacroContext *mc, int level);
+
+/**
+ */
void rpmInitMacros (MacroContext * mc, const char * macrofiles);
+
+/**
+ */
void rpmFreeMacros (MacroContext * mc);
#define COMPRESSED_NOT 0
#define COMPRESSED_OTHER 1
#define COMPRESSED_BZIP2 2
+
+/**
+ */
int isCompressed (const char * file, int * compressed);
+/**
+ */
char * rpmExpand (const char * arg, ...);
+
+/**
+ */
char * rpmCleanPath (char * path);
+
+/**
+ */
const char *rpmGetPath (const char * path, ...);
+
+/**
+ */
const char *rpmGenPath (const char * root, const char * mdir,
const char * file);
+
+/**
+ */
int rpmExpandNumeric (const char * arg);
#ifdef __cplusplus
diff --git a/rpmqv.c b/rpmqv.c
index d170cb17a..fccc2e242 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -61,6 +61,7 @@ static int noPgp = 0;
#define GETOPT_SHOWRC 1018
#define GETOPT_DEFINEMACRO 1020
#define GETOPT_EVALMACRO 1021
+#define GETOPT_RCFILE 1022
enum modes {
@@ -147,8 +148,10 @@ static struct poptOption optionsTable[] = {
{ "quiet", '\0', 0, &quiet, 0, NULL, NULL},
{ "verbose", 'v', 0, 0, 'v', NULL, NULL},
- { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO,NULL, NULL},
- { "eval", '\0', POPT_ARG_STRING, 0, GETOPT_EVALMACRO, NULL, NULL},
+ { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO,
+ N_("define macro <name> with value <body>"), N_("'<name> <body>'") },
+ { "eval", '\0', POPT_ARG_STRING, 0, GETOPT_EVALMACRO,
+ N_("print macro expansion to stdout"), N_("<expr>+") },
{ "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1, NULL, NULL},
{ "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0, NULL, NULL},
@@ -172,7 +175,10 @@ static struct poptOption optionsTable[] = {
{ "pipe", '\0', POPT_ARG_STRING, &pipeOutput, 0, NULL, NULL},
{ "root", 'r', POPT_ARG_STRING, &rootdir, 0, NULL, NULL},
- { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0, NULL, NULL},
+ { "macros", '\0', POPT_ARG_STRING, &macrofiles, 0,
+ N_("read <file:...> instead of default macro file(s)"),
+ N_("<file:...>") },
+ { "rcfile", '\0', 0, 0, GETOPT_RCFILE, NULL, NULL},
{ "showrc", '\0', 0, &showrc, GETOPT_SHOWRC, NULL, NULL},
#if defined(IAM_RPMQV) || defined(IAM_RPMK)
@@ -286,14 +292,14 @@ static void printUsage(void) {
#ifdef IAM_RPMDB
fprintf(fp, _(" %s {--initdb} [--dbpath <dir>]\n"), __progname);
- fprintf(fp, _(" %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"), __progname);
+ fprintf(fp, _(" %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"), __progname);
#endif
#ifdef IAM_RPMEIU
fprintf(fp, _(" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"), __progname);
puts(_(" [--replacepkgs] [--replacefiles] [--root <dir>]"));
puts(_(" [--excludedocs] [--includedocs] [--noscripts]"));
- puts(_(" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"));
+ puts(_(" [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"));
puts(_(" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"));
puts(_(" [--ftpproxy <host>] [--ftpport <port>]"));
puts(_(" [--httpproxy <host>] [--httpport <port>]"));
@@ -302,7 +308,7 @@ static void printUsage(void) {
puts(_(" [--ignoresize] file1.rpm ... fileN.rpm"));
fprintf(fp, (" %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"), __progname);
puts(_(" [--oldpackage] [--root <dir>] [--noscripts]"));
- puts(_(" [--excludedocs] [--includedocs] [--rcfile <file>]"));
+ puts(_(" [--excludedocs] [--includedocs] [--macros <file:...>]"));
puts(_(" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "));
puts(_(" [--ftpproxy <host>] [--ftpport <port>]"));
puts(_(" [--httpproxy <host>] [--httpport <port>]"));
@@ -310,21 +316,21 @@ static void printUsage(void) {
puts(_(" [--noorder] [--relocate oldpath=newpath]"));
puts(_(" [--badreloc] [--excludepath <path>] [--ignoresize]"));
puts(_(" file1.rpm ... fileN.rpm"));
- fprintf(fp, _(" %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"), __progname);
+ fprintf(fp, _(" %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"), __progname);
puts(_(" [--dbpath <dir>] [--nodeps] [--allmatches]"));
puts(_(" [--justdb] [--notriggers] package1 ... packageN"));
#endif /* IAM_RPMEIU */
#ifdef IAM_RPMQV
fprintf(fp, (" %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"), __progname);
- puts(_(" [--scripts] [--root <dir>] [--rcfile <file>]"));
+ puts(_(" [--scripts] [--root <dir>] [--macros <file:...>]"));
puts(_(" [--whatprovides] [--whatrequires] [--requires]"));
puts(_(" [--triggeredby]"));
puts(_(" [--ftpproxy <host>] [--ftpport <port>]"));
puts(_(" [--httpproxy <host>] [--httpport <port>]"));
puts(_(" [--provides] [--triggers] [--dump]"));
puts(_(" [--changelog] [--dbpath <dir>] [targets]"));
- fprintf(fp, _(" %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"), __progname);
+ fprintf(fp, _(" %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"), __progname);
puts(_(" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"));
puts(_(" [--nomd5] [targets]"));
fprintf(fp, (" %s {--querytags}\n"), __progname);
@@ -333,20 +339,20 @@ static void printUsage(void) {
#endif /* IAM_RPMQV */
#ifdef IAM_RPMBT
- fprintf(fp, _(" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile <file>]\n"), __progname);
+ fprintf(fp, _(" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros <file:...>]\n"), __progname);
puts( (" [--sign] [--nobuild] ]"));
puts(_(" [--target=platform1[,platform2...]]"));
puts(_(" [--rmsource] [--rmspec] specfile"));
- fprintf(fp, _(" %s {--rmsource} [--rcfile <file>] [-v] specfile\n"), __progname);
- fprintf(fp, _(" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
- fprintf(fp, _(" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
+ fprintf(fp, _(" %s {--rmsource} [--macros <file:...>] [-v] specfile\n"), __progname);
+ fprintf(fp, _(" %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
+ fprintf(fp, _(" %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
fprintf(fp, _(" %s {--freshen -F} file1.rpm ... fileN.rpm\n"), __progname);
#endif /* IAM_RPMBT */
#ifdef IAM_RPMK
- fprintf(fp, _(" %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"), __progname);
- fprintf(fp, _(" %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"), __progname);
- fprintf(fp, _(" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"), __progname);
+ fprintf(fp, _(" %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"), __progname);
+ fprintf(fp, _(" %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"), __progname);
+ fprintf(fp, _(" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros <file:...>]\n"), __progname);
puts(_(" package1 ... packageN"));
#endif /* IAM_RPMK */
@@ -393,12 +399,12 @@ static void printHelp(void) {
puts( _(" All modes support the following options:"));
printHelpLine(_(" --define '<name> <body>'"),
_("define macro <name> with value <body>"));
- printHelpLine(_(" --eval '<name>+' "),
- _("print the expansion of macro <name> to stdout"));
+ printHelpLine(_(" --eval '<expr>+' "),
+ _("print the expansion of macro <expr> to stdout"));
printHelpLine(_(" --pipe <cmd> "),
_("send stdout to <cmd>"));
- printHelpLine(_(" --rcfile <file> "),
- _("use <file> instead of /etc/rpmrc and $HOME/.rpmrc"));
+ printHelpLine(_(" --macros <file:...> "),
+ _("use <file:...> instead of default list of macro files"));
printHelpLine( " --showrc ",
_("display final rpmrc and macro configuration"));
#if defined(IAM_RPMBT) || defined(IAM_RPMDB) || defined(IAM_RPMEIU) || defined(IAM_RPMQV)
@@ -913,6 +919,12 @@ int main(int argc, const char ** argv)
noUsageMsg = 1;
} break;
+ case GETOPT_RCFILE:
+ fprintf(stderr, _("The --rcfile option has been eliminated.\n"));
+ fprintf(stderr, _("Use \"--macros <file:...>\" instead..\n"));
+ exit(EXIT_FAILURE);
+ /*@notreached@*/ break;
+
default:
fprintf(stderr, _("Internal error in argument processing (%d) :-(\n"), arg);
exit(EXIT_FAILURE);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 03:18:23 +0000