summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/package.c14
-rw-r--r--lib/poptALL.c42
-rw-r--r--lib/poptI.c12
-rw-r--r--lib/rpmcli.h5
-rw-r--r--lib/rpmlibprov.c2
-rw-r--r--macros.in17
-rw-r--r--po/POTFILES.in9
-rw-r--r--po/cs.po471
-rw-r--r--po/da.po473
-rw-r--r--po/de.po459
-rw-r--r--po/en_RN.po425
-rw-r--r--po/es.po425
-rw-r--r--po/eu_ES.po425
-rw-r--r--po/fi.po453
-rw-r--r--po/fr.po444
-rw-r--r--po/gl.po425
-rw-r--r--po/hu.po425
-rw-r--r--po/id.po425
-rw-r--r--po/is.po447
-rw-r--r--po/it.po425
-rw-r--r--po/ja.po456
-rw-r--r--po/ko.po471
-rw-r--r--po/no.po463
-rw-r--r--po/pl.po456
-rw-r--r--po/pt.po471
-rw-r--r--po/pt_BR.po509
-rw-r--r--po/ro.po425
-rw-r--r--po/rpm.pot425
-rw-r--r--po/ru.po471
-rw-r--r--po/sk.po456
-rw-r--r--po/sl.po462
-rw-r--r--po/sr.po453
-rw-r--r--po/sv.po471
-rw-r--r--po/tr.po472
-rw-r--r--po/uk.po425
-rw-r--r--po/wa.po425
-rw-r--r--po/zh.po425
-rw-r--r--po/zh_CN.GB2312.po425
-rw-r--r--rpm.spec.in6
-rw-r--r--rpmdb/legacy.c8
-rwxr-xr-xrpmqv.c2
-rw-r--r--system.h1
-rw-r--r--tools/rpmgraph.c46
-rw-r--r--zlib/.cvsignore1
44 files changed, 9023 insertions, 5025 deletions
diff --git a/lib/package.c b/lib/package.c
index ee9306867..96bee8962 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -143,8 +143,8 @@ Header headerRegenSigHeader(const Header h)
/*@unchecked@*/
static int nkeyids = 0;
-/*@unchecked@*/
-static int * keyids = NULL;
+/*@unchecked@*/ /*@only@*/ /*@null@*/
+static int * keyids;
/**
* Remember current key id.
@@ -152,8 +152,8 @@ static int * keyids = NULL;
* @return 0 if new keyid, otherwise 1
*/
static int rpmtsStashKeyid(rpmts ts)
- /*@globals keyids, nkeyids @*/
- /*@modifies keyids, nkeyids @*/
+ /*@globals nkeyids, keyids @*/
+ /*@modifies nkeyids, keyids @*/
{
struct pgpDigParams_s * sigp = NULL;
unsigned int keyid;
@@ -164,15 +164,19 @@ static int rpmtsStashKeyid(rpmts ts)
sigp = &ts->dig->signature;
keyid = pgpGrab(sigp->signid+4, 4);
+ if (keyid == 0)
+ return 0;
- if (keyids != NULL && keyid > 0)
+ if (keyids != NULL)
for (i = 0; i < nkeyids; i++) {
if (keyid == keyids[i])
return 1;
}
keyids = xrealloc(keyids, (nkeyids + 1) * sizeof(*keyids));
+/*@-boundswrite@*/
keyids[nkeyids] = keyid;
+/*@=boundswrite@*/
nkeyids++;
return 0;
diff --git a/lib/poptALL.c b/lib/poptALL.c
index 5beecdd5e..5e2f7391a 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -25,7 +25,7 @@ static const char * pipeOutput = NULL;
/*@unchecked@*/
/*@observer@*/ /*@null@*/
static const char * rcfile = NULL;
-/*@unchecked@*/
+/*@unchecked@*/ /*@observer@*/
static const char * rootdir = "/";
/*@-exportheadervar@*/
@@ -53,8 +53,10 @@ static void printVersion(void)
*/
/*@mayexit@*/
static void rpmcliConfigured(void)
- /*@globals internalState @*/
- /*@modifies internalState @*/
+ /*@globals rpmCLIMacroContext, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
+ /*@modifies rpmCLIMacroContext, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
{
static int initted = -1;
@@ -71,7 +73,10 @@ static void rpmcliAllArgCallback( /*@unused@*/ poptContext con,
/*@unused@*/ enum poptCallbackReason reason,
const struct poptOption * opt, const char * arg,
/*@unused@*/ const void * data)
- /*@*/
+ /*@globals rpmCLIMacroContext, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
+ /*@modifies rpmCLIMacroContext, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
{
#if 0
/*@observer@*/
@@ -92,7 +97,9 @@ fprintf(stderr, "*** rpmcliALL: -%c,--%s %s %s opt %p arg %p val %d\n", opt->sho
case 'D':
(void) rpmDefineMacro(NULL, arg, RMIL_CMDLINE);
rpmcliConfigured();
+/*@-type@*/
(void) rpmDefineMacro(rpmCLIMacroContext, arg, RMIL_CMDLINE);
+/*@=type@*/
break;
case 'E':
rpmcliConfigured();
@@ -118,6 +125,7 @@ fprintf(stderr, "*** rpmcliALL: -%c,--%s %s %s opt %p arg %p val %d\n", opt->sho
/*@=branchstate@*/
}
+/*@-bitwisesigned -compmempass @*/
/*@unchecked@*/
struct poptOption rpmcliAllPoptTable[] = {
/*@-type@*/ /* FIX: cast? */
@@ -158,7 +166,7 @@ struct poptOption rpmcliAllPoptTable[] = {
N_("read <FILE:...> instead of default file(s)"),
N_("<FILE:...>") },
#endif
- { "showrc", '\0', 0, POPT_SHOWRC|POPT_ARGFLAG_DOC_HIDDEN, 0,
+ { "showrc", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_SHOWRC,
N_("display final rpmrc and macro configuration"),
NULL },
@@ -176,6 +184,7 @@ struct poptOption rpmcliAllPoptTable[] = {
POPT_TABLEEND
};
+/*@=bitwisesigned =compmempass @*/
poptContext
rpmcliFini(poptContext optCon)
@@ -183,12 +192,15 @@ rpmcliFini(poptContext optCon)
optCon = poptFreeContext(optCon);
#if HAVE_MCHECK_H && HAVE_MTRACE
+ /*@-noeffect@*/
muntrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+ /*@=noeffect@*/
#endif
return NULL;
}
+/*@-globstate@*/
poptContext
rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
{
@@ -197,8 +209,11 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
int rc;
#if HAVE_MCHECK_H && HAVE_MTRACE
+ /*@-noeffect@*/
mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+ /*@=noeffect@*/
#endif
+/*@-globs -mods@*/
setprogname(argv[0]); /* Retrofit glibc __progname */
/* XXX glibc churn sanity */
@@ -206,14 +221,14 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
if ((__progname = strrchr(argv[0], '/')) != NULL) __progname++;
else __progname = argv[0];
}
+/*@=globs =mods@*/
+#if !defined(__LCLINT__)
(void)setlocale(LC_ALL, "" );
-#ifdef __LCLINT__
-#define LOCALEDIR "/usr/share/locale"
-#endif
(void)bindtextdomain(PACKAGE, LOCALEDIR);
(void)textdomain(PACKAGE);
+#endif
rpmSetVerbosity(RPMMESS_NORMAL);
@@ -223,9 +238,11 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
return NULL;
}
+/*@-nullpass -temptrans@*/
optCon = poptGetContext(__progname, argc, (const char **)argv, optionsTable, 0);
+/*@=nullpass =temptrans@*/
(void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
- poptReadDefaultConfig(optCon, 1);
+ (void) poptReadDefaultConfig(optCon, 1);
poptSetExecPath(optCon, RPMCONFIGDIR, 1);
/* Process all options, whine if unknown. */
@@ -233,18 +250,22 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
optArg = poptGetOptArg(optCon);
switch (rc) {
default:
+/*@-nullpass@*/
fprintf(stderr, _("%s: option table misconfigured (%d)\n"),
__progname, rc);
+/*@=nullpass@*/
exit(EXIT_FAILURE);
- /*@notreached@*/ break;
+ /*@notreached@*/ /*@switchbreak@*/ break;
}
}
if (rc < -1) {
+/*@-nullpass@*/
fprintf(stderr, "%s: %s: %s\n", __progname,
poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
poptStrerror(rc));
+/*@=nullpass@*/
exit(EXIT_FAILURE);
}
@@ -258,5 +279,6 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
return optCon;
}
+/*@=globstate@*/
/*@=boundsread@*/
diff --git a/lib/poptI.c b/lib/poptI.c
index d85570ceb..13736dedb 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -51,9 +51,9 @@ static void installArgCallback( /*@unused@*/ poptContext con,
argerror(_("exclude paths must begin with a /"));
ia->relocations = xrealloc(ia->relocations,
sizeof(*ia->relocations) * (ia->numRelocations + 1));
- /*@-temptrans@*/
+/*@-temptrans@*/
ia->relocations[ia->numRelocations].oldPath = xstrdup(arg);
- /*@=temptrans@*/
+/*@=temptrans@*/
ia->relocations[ia->numRelocations].newPath = NULL;
ia->numRelocations++;
break;
@@ -71,12 +71,12 @@ static void installArgCallback( /*@unused@*/ poptContext con,
argerror(_("relocations must have a / following the ="));
ia->relocations = xrealloc(ia->relocations,
sizeof(*ia->relocations) * (ia->numRelocations + 1));
- /*@-temptrans@*/
+/*@-temptrans@*/
ia->relocations[ia->numRelocations].oldPath = oldPath;
- /*@=temptrans@*/
- /*@-kepttrans@*/
+/*@=temptrans@*/
+/*@-kepttrans -usereleased @*/
ia->relocations[ia->numRelocations].newPath = newPath;
- /*@=kepttrans@*/
+/*@=kepttrans =usereleased @*/
ia->numRelocations++;
} break;
case POPT_ROLLBACK:
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index b48c0cc9e..ec28baba2 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -37,7 +37,10 @@ extern struct poptOption rpmcliAllPoptTable[];
/*@null@*/
poptContext
rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
- /*@*/;
+ /*@globals rpmCLIMacroContext, rpmGlobalMacroContext, stderr,
+ fileSystem, internalState @*/
+ /*@modifies rpmCLIMacroContext, rpmGlobalMacroContext, stderr,
+ fileSystem, internalState @*/;
/**
* Destroy most everything needed by an rpm CLI executable context.
diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c
index dfd48828d..2ccb338b4 100644
--- a/lib/rpmlibprov.c
+++ b/lib/rpmlibprov.c
@@ -57,8 +57,10 @@ void rpmShowRpmlibProvides(FILE * fp)
const struct rpmlibProvides_s * rlp;
for (rlp = rpmlibProvides; rlp->featureName != NULL; rlp++) {
+/*@-nullpass@*/ /* FIX: rlp->featureEVR not NULL */
rpmds pro = rpmdsSingle(RPMTAG_PROVIDENAME, rlp->featureName,
rlp->featureEVR, rlp->featureFlags);
+/*@=nullpass@*/
const char * DNEVR = rpmdsDNEVR(pro);
if (pro != NULL && DNEVR != NULL) {
diff --git a/macros.in b/macros.in
index 9baab9df9..6a1575f1d 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: /usr/lib/rpm/macros
# \verbatim
#
-# $Id: macros.in,v 1.105 2002/06/30 22:47:32 jbj Exp $
+# $Id: macros.in,v 1.106 2002/07/02 13:16:50 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
@@ -574,6 +574,21 @@
%{?_dependency_whiteout_5_2} \
%{nil}
+
+#==============================================================================
+# ---- Cache configuration macros.
+# Macro(s) used to configure the universe of headers used to
+# solve dependencies using rpmcache(8).
+#
+# Note: These values are specific to my machine, and most certainly
+# are incorrect for any non-redhat.com machine. The macros are
+# included here only to document the macro names and usage.
+%_bhpath file://localhost/mnt/dist
+%_bhcoll @(7.3|7.2|7.1|7.1sbe|7.1k|7.0|7.01j|7.0j|7.0sbe|7.0tc|6.2|6.2ha|6.2ee|6.1|6.0|5.2|5.1|5.0)
+%_bhN @(SRPMS|i386|alpha|sparc|s390|ia64)
+%_bhVR RedHat
+%_bhA RPMS
+
#==============================================================================
# ---- per-platform macros.
# Macros that are specific to an individual platform. The values here
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 04a739f18..81188d0ae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,6 +32,7 @@ lib/fsm.c
lib/manifest.c
lib/misc.c
lib/package.c
+lib/poptALL.c
lib/poptI.c
lib/poptQV.c
lib/psm.c
@@ -39,8 +40,10 @@ lib/query.c
lib/rpmal.c
lib/rpmchecksig.c
lib/rpmds.c
+lib/rpmfi.c
lib/rpminstall.c
lib/rpmlead.c
+lib/rpmlibprov.c
lib/rpmps.c
lib/rpmrc.c
lib/rpmte.c
@@ -52,16 +55,18 @@ lib/transaction.c
lib/verify.c
rpmdb/db3.c
rpmdb/dbconfig.c
+rpmdb/fprint.c
rpmdb/hdrNVR.c
rpmdb/header.c
rpmdb/header_internal.c
rpmdb/legacy.c
rpmdb/merge.c
rpmdb/poptDB.c
-rpmdb/rpmhash.c
rpmdb/rpmdb.c
+rpmdb/rpmhash.c
rpmdb/tagname.c
rpmio/digest.c
+rpmio/fts.c
rpmio/macro.c
rpmio/rpmio.c
rpmio/rpmlog.c
@@ -70,3 +75,5 @@ rpmio/rpmpgp.c
rpmio/rpmrpc.c
rpmio/ugid.c
rpmio/url.c
+tools/rpmcache.c
+tools/rpmgraph.c
diff --git a/po/cs.po b/po/cs.po
index 0ad4718f7..22cce5ed8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -74,254 +74,255 @@ 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:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "vypsat používanou verzi rpm"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "poskytnout výstu s méně detaily"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "poskytnout detailnější výstup"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "definování makra <jméno> s obsahem <tělo>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<jméno> <tělo>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "vypsat expanzi makra <výraz>+"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<výraz>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "odeslat stdout do <příkazu>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<přík>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "použít <adr> jako adresář nejvyšší úrovně"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<adresář>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "číst <soubor:...> místo implicitního makro souboru"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<soubor:...>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "číst <soubor:...> místo implicitního rpmrc souboru"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "zobrazit finální konfiguraci rpmrc a maker"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "zakázat použití libio(3) API"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "ladit protokol datového toku"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "ladit rpmio I/O"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "ladit manipulaci s URL cache"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr "Volby dotazů (s -q or --query):"
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr "Vollby kontroly (s -V or --verify):"
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr "Volby signatury:"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr "Volby databáze:"
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"Sestavovací volby s [ <spec_soubor> | <tar_soubor> | <zdrojový_balíček> ]:"
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr "Volby pro Instalaci/Aktualizaci/Mazání:"
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr "Společné volby pro všechny módy:"
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verze %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (c) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Tento program lze volně šířit podle podmínek GNU GPL."
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Použití: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr "Volba --rcfile byla odstraněna.\n"
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Použijte volbu \"--macros <soubor:...>\".\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Interní chyba při zpracování parametrů (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "specifikovat lze jen jeden hlavní režim"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "najednou lze provést jen jeden typ dotazu či ověření"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "neočekávaný příznak pro dotaz"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "neočekávaný formát dotazu"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "neočekávaný zdroj dotazu"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadána pro operaci, která databázi nepoužívá"
-#: rpmqv.c:744
+#: rpmqv.c:742
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"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "soubory mohou být přemístěny jen při instalaci balíčků"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "použít lze jen jeden z parametrů --prefix nebo --relocate"
-#: rpmqv.c:752
+#: rpmqv.c:750
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ů"
-#: rpmqv.c:755
+#: rpmqv.c:753
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ů"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "parametry pro --prefix musejí začínat znakem /"
-#: rpmqv.c:761
+#: rpmqv.c:759
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ů"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent může být použit jen při instalaci balíčků"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles může být použit jen při instalaci balíčků"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs může být použit jen při instalaci balíčků"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs může být použit jen při instalaci balíčků"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs může být použit jen při instalaci balíčků"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "použít lze jen jeden z parametrů --excludedocs a --includedocs"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch může být použit jen při instalaci balíčků"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos může být použit jen při instalaci balíčků"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize může být použit jen při instalaci balíčků"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches může být použit jen při instalaci balíčků"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles může být použit jen při instalaci balíčků"
-#: rpmqv.c:812
+#: rpmqv.c:810
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ů"
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -329,7 +330,7 @@ msgstr ""
"volba pro potlačení skriptů může být použita jen při instalaci nebo při "
"odstraňování balíčků"
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -337,7 +338,7 @@ msgstr ""
"volba pro potlačení triggerů může být použita jen při instalaci nebo "
"odstraňování balíčků"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -345,13 +346,13 @@ msgstr ""
"--nodeps může být použit jen při sestavování, rekompilaci, instalaci, "
"odstraňování a kontrole"
-#: rpmqv.c:831
+#: rpmqv.c:829
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í"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -359,82 +360,82 @@ msgstr ""
"--root (-r) může být použit jen při instalaci, odstraňování, dotazech nebo "
"znovuvytvoření databáze"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry pro --root (-r) musejí začínat znakem /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "žádné soubory k podepsání\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "přístup k souboru %s se nezdařil\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp nenalezeno: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Vložte heslovou frázi: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Chybná heslová fráze\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Heslová fráze je v pořádku.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Špatná %%_signature spec v souboru maker.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign může být použit jen při sestavování balíčků"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "spuštění selhalo\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "ke znovusestavení nezadány žádné balíčky"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "pro sestavení nezadány žádné spec soubory"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "pro sestavení nezadány žádné tar soubory"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "nezadány žádné balíčky pro instalaci"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "nezadány žádné balíčky pro instalaci"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "k dotazu nezadány žádné parametry"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány žádné balíčky"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "neočekávané parametry pro --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "k dotazu nezadány žádné parametry"
@@ -1604,45 +1605,59 @@ msgstr "%s vytvořen jako %s\n"
msgid "error creating temporary file %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "práce s balíčky verze 1 není podporována touto verzí RPM\n"
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "tato verze RPM podporuje práci s balíčky s verzí <= 4\n"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "číst <soubor:...> místo implicitního makro souboru"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musí začínat znakem /"
@@ -2030,7 +2045,7 @@ msgstr "nekontrolovat mód souborů"
msgid "don't verify files in package"
msgstr "nekontrolovat soubory v balíčku"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "nekontrolovat závislosti balíčků"
@@ -2193,8 +2208,8 @@ msgstr "balíček nemá vlastníka souboru ani seznamy id\n"
msgid "can't query %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevření %s selhalo: %s\n"
@@ -2208,7 +2223,7 @@ msgstr "dotaz na %s se nezdařil\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:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "žádný balíček neaktivuje %s\n"
@@ -2277,7 +2292,7 @@ msgstr "záznam balíčku číslo: %u\n"
msgid "record %u could not be read\n"
msgstr "záznam %d nelze přečíst\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "balíček %s není nainstalován\n"
@@ -2405,6 +2420,41 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n"
+#: lib/rpmfi.c:561
+#, fuzzy
+msgid "========== relocations\n"
+msgstr "========== ukládání tsort relací\n"
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "OS je vyřazen: %s\n"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%s vytvořen jako %s\n"
+
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "Provádění(%s): %s\n"
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "Provádění(%s): %s\n"
+
+#: lib/rpmfi.c:714
+#, fuzzy, c-format
+msgid "relocating %s to %s\n"
+msgstr "Provádění(%s): %s\n"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "nemohu provést dotaz %s: %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2414,83 +2464,84 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nezadány žádné balíčky pro instalaci"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, fuzzy, c-format
msgid "Retrieving %s\n"
msgstr "RPM verze %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, fuzzy, c-format
msgid " ... as %s\n"
msgstr "%s uloženo jako %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "cesta %s v balíčku %s není přemístitelná"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "neinstalován "
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "vytvoření zdrojového a binárního balíčku z <tar_soubor>"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "chybné závislosti při sestavování:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
#, fuzzy
msgid "installing binary packages\n"
msgstr "nainstalovat balíček"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "Položka %s musí být v balíčku přítomna: %s\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, fuzzy, c-format
msgid "Installing %s\n"
msgstr "řádek: %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2500,6 +2551,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "%s: Fread selhalo: %s\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3041,8 +3124,8 @@ msgstr "nemohu otevřít RPM databázi v %s\n"
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -3052,134 +3135,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuji %s-%s-%s \"%s\" z tsort relací.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstraňuji %s-%s-%s \"%s\" z tsort relací.\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "znovu vytvořit databázi z existující databáze"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Nelze přejmenovat %s na %s: %m\n"
@@ -3398,6 +3481,73 @@ msgstr "řádek %d: Položka Epoch/Serial musí být číslo: %s\n"
msgid "failed to create %s: %s\n"
msgstr "nemohu zjistit stav %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "ověřit podpis v balíčku"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "nekontrolovat závislosti balíčků"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "ověřit podpis v balíčku"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "chyba při vytváření dočasného souboru %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: Fread selhalo: %s\n"
+
+#: tools/rpmgraph.c:286
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
+msgstr "Společné volby pro všechny módy:"
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "definování makra <jméno> s obsahem <tělo>"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<jméno> <tělo>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<výraz>+"
+
#, fuzzy
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "dotaz/ověření balíčků vyžadujících závislost"
@@ -3997,9 +4147,6 @@ msgstr "nemohu zjistit stav %s: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "režim kontroly (zastaralý)"
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: Fread selhalo: %s\n"
-
#, fuzzy
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "nemohu znovu otevřít payload: %s\n"
@@ -4013,26 +4160,6 @@ msgstr "nemohu zjistit stav %s: %s\n"
#~ msgstr "Generuji podpis: %d\n"
#, fuzzy
-#~ msgid "========== relocations\n"
-#~ msgstr "========== ukládání tsort relací\n"
-
-#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "OS je vyřazen: %s\n"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%s vytvořen jako %s\n"
-
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "Provádění(%s): %s\n"
-
-#, fuzzy
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "Provádění(%s): %s\n"
-
-#, fuzzy
#~ msgid "cannot get %s lock on database\n"
#~ msgstr "nemohu otevřít RPM databázi v %s\n"
diff --git a/po/da.po b/po/da.po
index 84cd4723f..0a5280229 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2001-04-05 23:03GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -75,264 +75,265 @@ msgstr "fejl ved lćsning af hovedet pĺ pakke\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan ikke genĺbne pakkeindhold: %s\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "vis versionen af rpm som benyttes"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "medtag mindre detaljerede oplysninger"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "medtag mere detaljerede oplysninger"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "definér makro <navn> med vćrdi <vrdi>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<navn> <indhold>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "udlćs makroudvidelse af <udtryk>+"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<udtryk>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "send standard-ud til <kmd>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<kmd>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "brug <katalog> som topniveau-katalog"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<katalog>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "lćs <fil:...> i stedet for standard makrofil(er)"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "lćs <fil:...> i stedet for standard rpmrc-fil(er)"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "vis den endelige rpmrc og makrokonfiguration"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "undlad at benytte libio(3)-API"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "aflus protokol-datastrřm"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "aflus rpmio I/O"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "aflus URL-bufferhĺndtering"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr "Forespřrgselstilvalg (med -q eller --query):"
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr "Verifikationstilvalg (med -V eller --verify):"
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr "Signaturtilvalg"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr "Databasetilvalg:"
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opbygningstilvalg med [ <spec-fil> | <tararkiv> | <kildepakke> ]:"
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr "Fćlles tilvalg for alle rpm-tilstande:"
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "fil %s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Brug: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr "Tilvalget --rcfile er fjernet.\n"
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Brug \"--macros <fil:...>\" i stedet..\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "kun ét hovedtilvalg kan angives"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "kun én af forespřrgsel/verificér kan udfřres ad gangen"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "uventet forespřrgselsflag"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "uventet forespřrgselsformat"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "uventet forespřrgselskilde"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath angivet ved en operation, der ikke benytter en database"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omrokeres under installation"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "kun én af --prefix eller --relocate kan bruges"
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate og --excludepath kan kun bruges, nĺr nye pakker installeres"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun bruges, nĺr nye pakker installeres"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "parametre til --prefix skal starte med et /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun angives ved installation"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun angives ved installation"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan kun angives ved installation"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan kun angives ved installation"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan kun angives ved installation"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan kun angives ved installation"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "kun én af --excludedocs og --includedocs kan angives"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan kun angives ved installation"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan kun angives ved installation"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan kun angives ved installation"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan kun angives ved installation"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan kun angives ved installation"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb kan kun angives ved installation og sletning"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb kan kun angives ved installation og sletning"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--notriggers kan kun angives ved installation og sletning af pakker"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -340,13 +341,13 @@ msgstr ""
"--nodeps kan kun angives ved opbygning, genopbygning, genoversćttelse, "
"installation, sletning og verifikation"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test kan kun angives ved installation, sletning og opbygning"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -354,82 +355,82 @@ msgstr ""
"--root (-r) kan kun angives ved installation, sletning, forespřrgsel og "
"genopbygning af databasen"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "parameteren til --root (-r) skal starte med et /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "ingen filer at underskrive\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke tilgĺ filen %s\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp ikke fundet: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Indtast adgangskode: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Adgangskode ikke godkendt\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Adgangskode godkendt.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign kan kun bruges ved pakkeopbygning"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "eksekvering mislykkedes\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler angivet til genopbygning"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "ingen spec-fil angivet til opbygning"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "ingen tar-arkiver angivet til opbygning"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "ingen parametre angivet ved forespřrgsel"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "ingen parametre angivet ved verifikation"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "uventede parametre til --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "ingen parametre angivet ved forespřrgsel"
@@ -1602,46 +1603,60 @@ msgstr "%s oprettet som %s\n"
msgid "error creating temporary file %s\n"
msgstr "fejl ved oprettelse af midlertidig fil %s\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "indpakningsversion 1 understřttes ikke af denne udgave af RPM\n"
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"kun indpakninger med hovedversion <= 4 understřttes af denne udgave af RPM\n"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgćngelig signatur\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "lćs <fil:...> i stedet for standard makrofil(er)"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "udeladte stier skal begynde med et /"
@@ -2042,7 +2057,7 @@ msgstr "verificér ikke filerne i pakke"
msgid "don't verify files in package"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "undlad at tjekke pakkers afhćngighedskrav"
@@ -2209,8 +2224,8 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n"
msgid "can't query %s: %s\n"
msgstr "kunne ikke forespřrge %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ĺbning af %s mislykkedes %s\n"
@@ -2224,7 +2239,7 @@ msgstr "forespřrgsel af %s mislykkedes\n"
msgid "old format source packages cannot be queried\n"
msgstr "pakke med gammelt kildeformat kan ikke forespřrges\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ingen pakker udlřser %s\n"
@@ -2293,7 +2308,7 @@ msgstr "pakkens post-nummer: %u\n"
msgid "record %u could not be read\n"
msgstr "post %d kunne ikke lćses\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
@@ -2421,6 +2436,40 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr "========== gemmer omrokeringer\n"
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr "%5d ekskluderer %s\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d omrokerer %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "ekskluderer multilib-sti %s%s\n"
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr "ekskluderer %s %s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "omrokerer %s til %s\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "omrokerer kataloget %s til %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr "Forbereder..."
@@ -2429,82 +2478,83 @@ msgstr "Forbereder..."
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker til installation..."
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "overspringer %s - overfřrsel mislykkedes - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke omrokeres\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved lćsning fra filen %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "filen %s krćver en nyere version af RPM\n"
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fandt %d kilde- og %d binćrpakker\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "afhćngighedskrav, der ikke kunne imřdekommes:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "installerer binćrpakker\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kunne ikke ĺbne fil %s: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" angiver flere pakker\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke ĺbne %s: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2514,6 +2564,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "lćsning mislykkedes: %s (%d)\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3051,8 +3133,8 @@ msgstr "kan ikke ĺbne '%s'-indeks\n"
msgid "no dbpath has been set\n"
msgstr "der er ikke sat nogen dbpath\n"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
@@ -3062,138 +3144,138 @@ msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
msgid "error(%d) storing record #%d into %s\n"
msgstr "fejl(%d) ved gemning af post %s i %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan ikke lćse hoved ved 0x%x\n"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "fjerner \"%s\" fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "fjerne %d indgange fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "fejl(%d) ved gemning af post %s i %s\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
"tilfřjer \"%s\" til '%s'-indekset.\n"
"\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "tilfřjer %d indgange til '%s'-indekset.\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "fejl(%d) ved gemning af post %s i %s\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "der ikke sat nogen dbpath"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "genopbygger database %s over i %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr "den midlertidige database %s eksisterer allerede\n"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
"opretter kataloget %s\n"
"\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr "opretter kataloget %s: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ĺbner gammel database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ĺbner ny database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "post nummer %d i databasen er fejlbehćftet -- overspringer.\n"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kunne ikke tilfřje posten, der tidligere var ved %d\n"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "kunne ikke erstatte gammel database med ny database!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "erstat filer i %s med filer fra %s for at genoprette"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr "fjerner kataloget %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunne ikke fjerne katalog %s: %s\n"
@@ -3405,6 +3487,75 @@ msgstr "url-port skal vćre et tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke oprette %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "verificér pakkesignatur"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "undlad at tjekke pakkers afhćngighedskrav"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "verificér pakkesignatur"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr ""
+"opretter kataloget %s\n"
+"\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: lćs manifest mislykkedes: %s\n"
+
+#: tools/rpmgraph.c:286
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
+msgstr "Fćlles tilvalg for alle rpm-tilstande:"
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "definér makro <navn> med vćrdi <vrdi>"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<navn> <indhold>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<udtryk>+"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "fjernelse af disse pakker ville bryde afhćngighederne:\n"
@@ -4000,9 +4151,6 @@ msgstr "kunne ikke oprette %s: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "gammel rpm verifikationstilstand"
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: lćs manifest mislykkedes: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "kunne ikke ĺbne %s/packages.rpm\n"
@@ -4012,27 +4160,6 @@ msgstr "kunne ikke oprette %s: %s\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "Genererer signatur med gpg.\n"
-#~ msgid "========== relocations\n"
-#~ msgstr "========== gemmer omrokeringer\n"
-
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "%5d ekskluderer %s\n"
-
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d omrokerer %s -> %s\n"
-
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "ekskluderer multilib-sti %s%s\n"
-
-#~ msgid "excluding %s %s\n"
-#~ msgstr "ekskluderer %s %s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "omrokerer %s til %s\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "omrokerer kataloget %s til %s\n"
-
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/de.po b/po/de.po
index 268c6ffda..ed8f29eb7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -116,265 +116,265 @@ msgstr "Fehler beim Suchen nach Paket %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "Die benutzte RPM-Version anzeigen"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
# , c-format
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
# , c-format
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Version %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright Š 1998 - Red Hat Software"
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Dies darf unter den Bedingungen der ťGNU GPLŤ frei verteilt werden"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Benutzung: rpm {--help}"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Benutzen Sie stattdessen -e oder --erase\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "Es darf nur ein Hauptmodus angegeben werden"
-#: rpmqv.c:687
+#: rpmqv.c:685
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"
-#: rpmqv.c:691
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query flags"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:694
+#: rpmqv.c:692
#, fuzzy
msgid "unexpected query format"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "Unerwartete Quelle der Anfrage"
-#: rpmqv.c:738
+#: rpmqv.c:736
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:744
+#: rpmqv.c:742
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "Dateien können nur während der Paketinstallation verschoben werden"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
-#: rpmqv.c:752
+#: rpmqv.c:750
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "Argumente zu --prefix müssen mit einem / beginnen"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:799
+#: rpmqv.c:797
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -383,7 +383,7 @@ msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -392,7 +392,7 @@ msgstr ""
"--justdb kann nur während der Paketinstallation und -deinstallation "
"angegeben werden"
-#: rpmqv.c:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -401,7 +401,7 @@ msgstr ""
"--nodeps darf nur während der Paketinstallation, -deinstallation und -"
"überprüfung angegeben werden"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -409,7 +409,7 @@ msgstr ""
"--test darf nur während der Paketinstallation, -deinstallation und -"
"erstellung angegeben werden"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -417,84 +417,84 @@ msgstr ""
"--root (-r) darf nur während der Paketinstallation, -deinstallation, -"
"anfrage und Datenbankneuerstellungen angegeben werden"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmqv.c:896
+#: rpmqv.c:894
#, fuzzy
msgid "pgp not found: "
msgstr "Datei auf dem Server nicht gefunden"
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Das Passwort ist richtig.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign darf nur während der Paketerstellung benutzt werden"
-#: rpmqv.c:936
+#: rpmqv.c:934
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
@@ -1739,49 +1739,62 @@ msgstr "kann Datei %s nicht öffnen: "
msgid "error creating temporary file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-#: lib/package.c:187
+#: lib/package.c:224
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:195
+#: lib/package.c:232
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ťrpmReadSignatureŤ fehlgeschlagen\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
#, fuzzy
msgid "exclude paths must begin with a /"
@@ -2204,7 +2217,7 @@ msgstr "Paket installieren"
msgid "don't verify files in package"
msgstr "Paket installieren"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "Dateiabhängigkeiten nicht überprüfen"
@@ -2374,8 +2387,8 @@ msgstr "Paket hat keinen Namen"
msgid "can't query %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
@@ -2389,7 +2402,7 @@ msgstr "Anfrage von %s fehlgeschlagen\n"
msgid "old format source packages cannot be queried\n"
msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "kein Paket triggert %s\n"
@@ -2462,7 +2475,7 @@ msgstr "ungültige Paket-Nummer: %s\n"
msgid "record %u could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
@@ -2589,6 +2602,43 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Paket %s wird nicht in %s aufgeführt"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+# , c-format
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "Hole %s heraus\n"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "kann Datei %s nicht öffnen: "
+
+# , c-format
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "Hole %s heraus\n"
+
+# , c-format
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "Hole %s heraus\n"
+
+#: lib/rpmfi.c:714
+#, fuzzy, c-format
+msgid "relocating %s to %s\n"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2599,83 +2649,84 @@ msgid "Preparing packages for installation..."
msgstr "Es wurden keine Pakete für die Installation angegeben"
# , c-format
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, 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:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Fehler: %s kann nicht installiert werden\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
@@ -2685,6 +2736,38 @@ msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
msgid "read failed: %s (%d)\n"
msgstr "lesen fehlgeschlagen: %s (%d)"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3237,8 +3320,8 @@ msgstr "Fehler: kann %s nicht öffnen\n"
msgid "no dbpath has been set\n"
msgstr "ťdbpathŤ ist nicht gesetzt"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "Fehler beim Eintrag %s von %s"
@@ -3248,140 +3331,140 @@ msgstr "Fehler beim Eintrag %s von %s"
msgid "error(%d) storing record #%d into %s\n"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "Fehler beim Eintrag %s von %s"
# FIXME
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
# FIXME
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "Fehler beim Eintrag %s von %s"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
# FIXME
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# FIXME
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "ťdbpathŤ ist nicht gesetzt"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "die temporäre Datenbank %s existiert schon"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
"Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
# , c-format
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -3606,6 +3689,63 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
msgid "failed to create %s: %s\n"
msgstr "anlegen von %s fehlgeschlagen\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "Paketsignatur überprüfen"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "Dateiabhängigkeiten nicht überprüfen"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "Paketsignatur überprüfen"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
# oder besser: "... verletzen" ?
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
@@ -4178,10 +4318,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
#~ msgstr "Anfrage-Modus"
#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-
-#, fuzzy
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
@@ -4193,29 +4329,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "PGP-Signatur generieren"
-# , c-format
-#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "Hole %s heraus\n"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "kann Datei %s nicht öffnen: "
-
-# , c-format
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "Hole %s heraus\n"
-
-# , c-format
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "Hole %s heraus\n"
-
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-
#, fuzzy
#~ msgid "opening db file %s mode 0x%x\n"
#~ msgstr "Datenbank aus der vorhandenen neu erstellen"
diff --git a/po/en_RN.po b/po/en_RN.po
index 9f349a5cb..36f658037 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 9f349a5cb..36f658037 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 9f349a5cb..36f658037 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 1a652bd8e..6b662dc08 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -73,258 +73,258 @@ msgstr "virhe etsittäessä pakettia %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "tulosta käytetyn rpm:n versio"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "lähetä vakiotuloste <komento>:lle"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "en voinut avata %s: %s"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versio %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "käyttö: rpm {--help}"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Käytä sen sijaan -e tai --erase .\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "vain yksi päämoodi voidaan määritellä"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
-#: rpmqv.c:691
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query flags"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:694
+#: rpmqv.c:692
#, fuzzy
msgid "unexpected query format"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "odottamaton kyselyn lähde"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
-#: rpmqv.c:744
+#: rpmqv.c:742
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "vain asennus tai päivitys voidaan pakottaa"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "vain toinen --prefix tai --relocate voidaan antaa"
-#: rpmqv.c:752
+#: rpmqv.c:750
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix parametrien pitää alkaa /-merkillä"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:799
+#: rpmqv.c:797
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -332,7 +332,7 @@ msgid ""
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -340,7 +340,7 @@ msgid ""
msgstr ""
"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
-#: rpmqv.c:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -349,7 +349,7 @@ msgstr ""
"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
"tarkistettaessa"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -357,7 +357,7 @@ msgstr ""
"--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
"käännettäessä"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -365,84 +365,84 @@ msgstr ""
"--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
"kyseltäessä ja tietokannan uudelleenluonnissa"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametrit --root (-r):lle alettava /-merkillä"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmqv.c:896
+#: rpmqv.c:894
#, fuzzy
msgid "pgp not found: "
msgstr "Tiedostoa ei löytynyt palvelimelta"
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
-#: rpmqv.c:936
+#: rpmqv.c:934
#, fuzzy
msgid "exec failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "kyselylle ei annettu parametrejä"
@@ -1625,49 +1625,62 @@ msgstr "en voinut avata tiedostoa %s: "
msgid "error creating temporary file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:187
+#: lib/package.c:224
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:195
+#: lib/package.c:232
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
#, fuzzy
msgid "exclude paths must begin with a /"
@@ -2087,7 +2100,7 @@ msgstr "asenna paketti"
msgid "don't verify files in package"
msgstr "asenna paketti"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
@@ -2255,8 +2268,8 @@ msgstr "paketilla ei ole nimeä"
msgid "can't query %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
@@ -2270,7 +2283,7 @@ msgstr "%s:n kysely ei onnistunut\n"
msgid "old format source packages cannot be queried\n"
msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
@@ -2340,7 +2353,7 @@ msgstr "virheellinen paketin numero: %s\n"
msgid "record %u could not be read\n"
msgstr "tietuetta %d ei voitu lukea\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -2466,6 +2479,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paketti %s ei ole %s:ssä"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "Haen: %s\n"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "en voinut avata tiedostoa %s: "
+
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "Haen: %s\n"
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "Haen: %s\n"
+
+#: lib/rpmfi.c:714
+#, fuzzy, c-format
+msgid "relocating %s to %s\n"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2475,83 +2522,84 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "virhe: %s ei voida asentaa\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "poistolle ei määritelty paketteja"
@@ -2561,6 +2609,38 @@ msgstr "poistolle ei määritelty paketteja"
msgid "read failed: %s (%d)\n"
msgstr "luku epäonnistui: %s (%d)"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3105,8 +3185,8 @@ msgstr "virhe: en voi avata %s\n"
msgid "no dbpath has been set\n"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
@@ -3116,134 +3196,134 @@ msgstr "virhe luettaessa tietuetta %s %s:stä"
msgid "error(%d) storing record #%d into %s\n"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "en voi lukea headeria %d:stä päivittäessä"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "väliaikainen tietokanta %s on jo olemassa"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "en voi lisätä tietuetta %d:stä"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
@@ -3466,6 +3546,63 @@ msgstr "virhe: ftpport pitää olla luku\n"
msgid "failed to create %s: %s\n"
msgstr "%s:n luonti epäonnistui\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "tarkista paketin allekirjoitus"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "älä tarkista paketin riippuvuuksia"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "tarkista paketin allekirjoitus"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: readLead epäonnistui\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
@@ -4033,10 +4170,6 @@ msgstr "%s:n luonti epäonnistui\n"
#~ msgstr "kyselymoodi"
#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: readLead epäonnistui\n"
-
-#, fuzzy
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "virhe: en voi avata %s%s/packages.rpm\n"
@@ -4049,26 +4182,6 @@ msgstr "%s:n luonti epäonnistui\n"
#~ msgstr "generoi PGP-allekirjoitus"
#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "Haen: %s\n"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "en voinut avata tiedostoa %s: "
-
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "Haen: %s\n"
-
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "Haen: %s\n"
-
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "virhe luotaessa hakemistoa %s: %s"
-
-#, fuzzy
#~ msgid "opening db file %s mode 0x%x\n"
#~ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
diff --git a/po/fr.po b/po/fr.po
index 04d6d523b..255be8afc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -79,278 +79,278 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
#, fuzzy
msgid "print the version of rpm being used"
msgstr " --version\t\t- affiche la version de rpm utilise"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr " --version\t\t- affiche la version de rpm utilise"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
#, fuzzy
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme rpertoire racine"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Peut tre redistribu librement selon les termes de la GNU GPL"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Utilisez de prfrence -e ou --erase.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "un seul type de requte/vrification peut tre effectu la fois"
-#: rpmqv.c:691
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query flags"
msgstr "source de requte inattendue"
-#: rpmqv.c:694
+#: rpmqv.c:692
#, fuzzy
msgid "unexpected query format"
msgstr "source de requte inattendue"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "source de requte inattendue"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "seules l'installation et la mise jour peuvent tre forces"
-#: rpmqv.c:746
+#: rpmqv.c:744
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr ""
"--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:749
+#: rpmqv.c:747
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:752
+#: rpmqv.c:750
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--clean ne peut tre spcifi que lors de la construction d'un package"
-#: rpmqv.c:755
+#: rpmqv.c:753
#, fuzzy
msgid "--prefix may only be used when installing new packages"
msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
-#: rpmqv.c:758
+#: rpmqv.c:756
#, fuzzy
msgid "arguments to --prefix must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:778
+#: rpmqv.c:776
#, fuzzy
msgid "--excludedocs may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:782
+#: rpmqv.c:780
#, fuzzy
msgid "--includedocs may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:786
+#: rpmqv.c:784
#, fuzzy
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "un seul mode majeur peut tre spcifi"
-#: rpmqv.c:790
+#: rpmqv.c:788
#, fuzzy
msgid "--ignorearch may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:794
+#: rpmqv.c:792
#, fuzzy
msgid "--ignoreos may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:799
+#: rpmqv.c:797
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:803
+#: rpmqv.c:801
#, fuzzy
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:807
+#: rpmqv.c:805
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr ""
"--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
-#: rpmqv.c:812
+#: rpmqv.c:810
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -359,7 +359,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -368,7 +368,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -377,7 +377,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:831
+#: rpmqv.c:829
#, fuzzy
msgid ""
"--test may only be specified during package installation, erasure, and "
@@ -386,7 +386,7 @@ msgstr ""
"--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
"package"
-#: rpmqv.c:836
+#: rpmqv.c:834
#, fuzzy
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
@@ -395,85 +395,85 @@ msgstr ""
"--root (-r) ne peut tre spcifi que lors de l'installation, de la "
"dsinstallation ou de l'interrogation d'un package"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "les arguments de --root (-r) doivent commencer par un /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
#, fuzzy
msgid "pgp not found: "
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "La vrification du mot de passe a chou\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Mot de passe correct.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
-#: rpmqv.c:936
+#: rpmqv.c:934
#, fuzzy
msgid "exec failed\n"
msgstr "La construction a chou.\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "aucun package n'a t spcifi pour la reconstruction"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
#, fuzzy
msgid "no tar files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "aucun argument n'a t fourni pour la requte"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "aucun argument n'a t fourni pour la vrification"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "aucun argument n'a t fourni pour la requte"
@@ -1653,45 +1653,58 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "error creating temporary file %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
#, fuzzy
msgid "exclude paths must begin with a /"
@@ -2134,7 +2147,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2300,8 +2313,8 @@ msgstr "aucun package n'a t spcifi pour l'installation"
msgid "can't query %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "La construction a chou.\n"
@@ -2315,7 +2328,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2385,7 +2398,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2510,6 +2523,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmfi.c:714
+#, fuzzy, c-format
+msgid "relocating %s to %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2519,82 +2566,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
@@ -2604,6 +2652,38 @@ msgstr "aucun package n'a t spcifi pour la dsinstallation"
msgid "read failed: %s (%d)\n"
msgstr "impossible d'ouvrir: %s\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3143,8 +3223,8 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -3154,134 +3234,134 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "error(%d) storing record #%d into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -3493,6 +3573,66 @@ msgstr ""
msgid "failed to create %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr ""
+" -f <file>+ - interroge le package qui appartient <file>"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr ""
+" -f <file>+ - interroge le package qui appartient <file>"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr ""
+" -f <file>+ - interroge le package qui appartient <file>"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
#, fuzzy
#~ msgid "package %s has unsatisfied Requires: %s\n"
#~ msgstr "aucun package n'a t spcifi pour l'installation"
@@ -3813,10 +3953,6 @@ msgstr "impossible d'ouvrir: %s\n"
#~ msgstr "aucun package n'a t spcifi pour l'installation"
#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "impossible d'ouvrir: %s\n"
-
-#, fuzzy
#~ msgid "Generating signature using PGP.\n"
#~ msgstr " --sign - genre une signature PGP"
@@ -3825,14 +3961,6 @@ msgstr "impossible d'ouvrir: %s\n"
#~ msgstr " --sign - genre une signature PGP"
#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "impossible d'ouvrir: %s\n"
-
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "impossible d'ouvrir: %s\n"
-
-#, fuzzy
#~ msgid "opening db file %s mode 0x%x\n"
#~ msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/gl.po b/po/gl.po
index 034f38874..d7cd94b06 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2001-01-13 22:31+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -73,353 +73,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1564,45 +1564,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1974,7 +1987,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2131,8 +2144,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2146,7 +2159,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2215,7 +2228,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2338,6 +2351,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2346,81 +2393,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2430,6 +2478,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2957,8 +3037,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2968,134 +3048,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3306,3 +3386,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 9f349a5cb..36f658037 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 9f349a5cb..36f658037 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/is.po b/po/is.po
index 5f32964e0..65e3593fb 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2001-07-12 13:25+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -74,354 +74,355 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "prenta útgáfunúmer rpm sem veriđ er ađ nota"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "skilgreina fjölva <nafn> međ gildinu <gildi>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<nafn> <gildi>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "prenta útvíkkun fjölva <expr>+"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "senda frálag í <skipun>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "sýna endanlega rpmrc og stillingar fjölva"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM útgáfa %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc"
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Ţessu má dreifa frjálst samkvćmt skilmálum GNU GPL"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1572,45 +1573,58 @@ msgstr "%s búiđ til sem %s\n"
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1990,7 +2004,7 @@ msgstr "ekki yfirfara heimildir skráa"
msgid "don't verify files in package"
msgstr "ekki yfirfara skrárnar í pakkanum"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ekki skođa pakkaskilyrđin"
@@ -2150,8 +2164,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2165,7 +2179,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "get ekki opnađ pakka gagnagrunn í\n"
@@ -2234,7 +2248,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2357,6 +2371,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "get ekki opnađ pakka gagnagrunn í\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "%5d fćra %s -> %s\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d fćra %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "lína %d: %s\n"
+
+#: lib/rpmfi.c:714
+#, fuzzy, c-format
+msgid "relocating %s to %s\n"
+msgstr "%5d fćra %s -> %s\n"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "%5d fćra %s -> %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2365,82 +2413,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "gat ekki útbúiđ pakkaskilyrđi:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2450,6 +2499,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2978,8 +3059,8 @@ msgstr "get ekki opnađ %s index\n"
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2989,134 +3070,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3328,6 +3409,71 @@ msgstr "gátt slóđar verđur ađ vera tala\n"
msgid "failed to create %s: %s\n"
msgstr "gat ekki búiđ til %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "ekki skođa pakkaskilyrđin"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "ekki skođa pakkaskilyrđin"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "ekki skođa pakkaskilyrđin"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s rmdir %s brást: %s\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "skilgreina fjölva <nafn> međ gildinu <gildi>"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<nafn> <gildi>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<expr>+"
+
#~ msgid "cannot open rpm database in %s\n"
#~ msgstr "get ekki opnađ pakka gagnagrunn í %s\n"
@@ -3674,9 +3820,6 @@ msgstr "gat ekki búiđ til %s: %s\n"
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "get ekki opnađ %s/packages.rpm\n"
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d fćra %s -> %s\n"
-
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/it.po b/po/it.po
index 9f349a5cb..36f658037 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index b074b4193..a280b1843 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -81,124 +81,124 @@ msgstr "ĽŃĽĂĽąĄźĽ¸¤Ť¤éĽŘĽĂĽŔ¤ÎĆɤߚţ¤ß¤ÎĽ¨ĽéĄź\n"
msgid "cannot re-open payload: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "ɸ˝ŕ˝ĐÎϤň <cmd> ¤ŘĽŃĽ¤Ľ×¤ˇ¤Ţ¤š"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
#, fuzzy
msgid "Signature options:"
msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ĽĐĄźĽ¸ĽçĽó %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
@@ -206,72 +206,72 @@ msgstr ""
"ËÝĚőźÔ żŔĹÄ ˝ź <kanda@nn.iij4u.or.jp>\n"
"¸íĚőĹů¤ĎżŔĹĤޤÇ"
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "GNU°ěČ̸řÍ­ťČÍŃľöÂú˝ń¤Î˛ź¤ÇźŤÍł¤ËÇŰÉۤǤ­¤Ţ¤š"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "ťČÍŃËĄ: rpm {--help}"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "-e ¤Ť --erase ¤ňťČ¤Ă¤Ć¤Ż¤Ŕ¤ľ¤¤\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, fuzzy, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "°úżô˝čÍý(%d)¤Ç¤ÎĆâÉôĽ¨ĽéĄź :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "°ě¤Ä¤ÎĽáĽ¸ĽăĄźĽâĄźĽÉ¤Î¤ß¤ňťŘÄꤡ¤Ć¤Ż¤Ŕ¤ľ¤¤"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "Ě䤤šç¤ď¤ť/¸ĄžÚ¤Ď°ěĹ٤˰ě¤Ä¤ˇ¤ŤźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
-#: rpmqv.c:691
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query flags"
msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽéĽ°"
-#: rpmqv.c:694
+#: rpmqv.c:692
#, fuzzy
msgid "unexpected query format"
msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽŠĄźĽŢĽĂĽČ"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽ˝ĄźĽš"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "ĽÇĄźĽżĽŮĄźĽš¤ňťČÍѤˇ¤Ę¤¤¤Î¤Ë --dbpath ¤ŹÍż¤¨¤é¤ě¤Ć¤¤¤Ţ¤š"
-#: rpmqv.c:744
+#: rpmqv.c:742
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉĄ˘Ľ˝ĄźĽšşď˝üĄ˘ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľëşď˝üťţ¤Î¤ßśŻŔŠ¤Ç¤­"
"¤Ţ¤š"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "ĽŐĽĄĽ¤Ľë¤ĎĽŃĽĂĽąĄźĽ¸Ľ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßşĆÇŰĂ֤Ǥ­¤Ţ¤š"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ¤â¤ˇ¤Ż¤Ď --relocate ¤Î¤¤¤ş¤ě¤Ť¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpmqv.c:752
+#: rpmqv.c:750
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
@@ -279,82 +279,82 @@ msgstr ""
"--relocate ¤Č --excludepath ¤Ďżˇ¤ˇ¤¤ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍŃ"
"¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix ¤ĎżˇľŹ¤ËĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ¤Ř¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ¤Č --includedocs ¤Ď¤É¤Á¤é¤Ť°ěĘý¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "-ignoreos ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:799
+#: rpmqv.c:797
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "-ignoresize ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ¤ĎĽŃĽĂĽąĄźĽ¸¤Îşď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -362,13 +362,13 @@ msgid ""
msgstr ""
"--nodeps ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎşîŔŽĄ˘Ľ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘şîŔŽťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -376,83 +376,83 @@ msgstr ""
"--root (-r) ¤ĎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘Ě䤤šç¤ď¤ťĄ˘ĽÇĄźĽżĽŮĄźĽšşĆš˝ĂŰťţ¤Î¤ßťŘÄę¤Ç"
"¤­¤Ţ¤š"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "˝đĚž¤š¤ë¤ż¤á¤ÎĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤ËĽ˘ĽŻĽťĽš¤Ç¤­¤Ţ¤ť¤ó\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
#, fuzzy
msgid "pgp not found: "
msgstr "pgp ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "ĽŃĽšĽŐĽěĄźĽş¤ňĆţÎϤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "ĽŃĽšĽŐĽěĄźĽşĽÁĽ§ĽĂĽŻ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "ĽŃĽšĽŐĽěĄźĽş¤ĎŔľžď¤Ç¤šĄĽ\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤ĽëĂć¤ÎĚľ¸ú¤Ę %%_signature ĄŁ\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "źÂšÔźşÇÔ\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "şĆşîŔŽ¤š¤ë¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "şîŔŽ¤Î¤ż¤á¤Î spec ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "¸ĄžÚ¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°úżô¤Ź´Ö°ă¤Ă¤Ć¤¤¤Ţ¤š"
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
@@ -1650,49 +1650,62 @@ msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
msgid "error creating temporary file %s\n"
msgstr "°ěťţĽŐĽĄĽ¤Ľë %s ¤ÎşîŔŽĽ¨ĽéĄź"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/package.c:187
+#: lib/package.c:224
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"ĽáĽ¸ĽăĄźČÖšć <=3 ¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤ß¤ł¤ÎĽĐĄźĽ¸ĽçĽó¤Î RPM ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤š"
-#: lib/package.c:195
+#: lib/package.c:232
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"ĽáĽ¸ĽăĄźČÖšć <=3 ¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤ß¤ł¤ÎĽĐĄźĽ¸ĽçĽó¤Î RPM ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤š"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Í­¸ú¤Ę˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
#, fuzzy
msgid "exclude paths must begin with a /"
@@ -2123,7 +2136,7 @@ msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
msgid "don't verify files in package"
msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
@@ -2292,8 +2305,8 @@ msgstr "ĽŃĽĂĽąĄźĽ¸¤ĎĽŐĽĄĽ¤Ľë˝ęÍ­źÔ¤ä id ĽęĽšĽČ¤ň¤É¤Á¤é¤âťý¤Ă¤Ć¤¤¤Ţ¤ť¤ó"
msgid "can't query %s: %s\n"
msgstr "%s ¤ňşď˝ü(unlink)¤Ç¤­¤Ţ¤ť¤ó: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
@@ -2307,7 +2320,7 @@ msgstr "%s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
msgid "old format source packages cannot be queried\n"
msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
@@ -2377,7 +2390,7 @@ msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
msgid "record %u could not be read\n"
msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
@@ -2506,6 +2519,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2515,82 +2562,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤Č¤ˇ¤Ć...\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź "
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n"
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2600,6 +2648,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "Ćɤߚţ¤ß¤ÎźşÇÔ: %s (%d)"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3152,8 +3232,8 @@ msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
msgid "no dbpath has been set\n"
msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
@@ -3163,136 +3243,136 @@ msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
msgid "error(%d) storing record #%d into %s\n"
msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤Ëşď˝ü¤ÇĽ¨ĽéĄź"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rootdir %s Ăć¤ÇĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "°ěťţĹŞ¤ĘĽÇĄźĽżĽŮĄźĽš %s ¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "żˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "ĽÇĄźĽżĽŮĄźĽšĂć¤ÎĽěĽłĄźĽÉČÖšć %d ¤ĎÉÔŔľ¤Ç¤š -- ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "%d ¤Ë ĽŞĽęĽ¸ĽĘĽë¤ÎĽěĽłĄźĽÉ¤ňÉղäǤ­¤Ţ¤ť¤ó"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ĽÇĄźĽżĽŮĄźĽš¤ÎşĆš˝Ăۤ˟şÇÔ; ĽŞĽęĽ¸ĽĘĽëĽÇĄźĽżĽŮĄźĽš¤Ź¤Ţ¤Ŕ¤˝¤ł¤ËťÄ¤Ă¤Ć¤¤¤Ţ¤š\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ËĂÖ¤­´š¤¨¤ë¤Î¤ËźşÇÔ!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "%s Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽęĽŤĽĐĄź¤š¤ë¤ż¤á¤Ë %s ¤Ť¤éĽŐĽĄĽ¤Ľë¤ČĂÖ¤­´š¤¨¤Ţ¤š"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
@@ -3516,6 +3596,63 @@ msgstr "url ĽÝĄźĽČ¤Ďżôťú¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó\n"
msgid "failed to create %s: %s\n"
msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "¤ł¤ě¤é¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤Č°Í¸Ŕ­¤ňÇ˲ő¤ˇ¤Ţ¤š:\n"
@@ -3855,10 +3992,6 @@ msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
#~ msgstr "Ě䤤šç¤ď¤ťĽâĄźĽÉ"
#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
-
-#, fuzzy
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
@@ -3871,29 +4004,6 @@ msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
#~ msgstr "GPG ¤ňťČÍѤˇ¤Ć˝đĚž¤ÎŔ¸ŔŽĂć\n"
#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
-
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-
-#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 75c0aeca2..c791077e5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2002-03-04 17:17+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@@ -74,265 +74,266 @@ msgstr "ĆĐĹ°ÁöŔÇ Çě´ő¸Ś ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
msgid "cannot re-open payload: %s\n"
msgstr "payload¸Ś ´Ů˝Ă ż­ źö žřŔ˝: %s\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "ÇöŔç ťçżëľÇ°í ŔÖ´Â rpm šöŔüŔť ÇĽ˝ĂÇŐ´Ď´Ů"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "ŔÚźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "žĆÁÖ ťóźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "<şťšŽ>ŔÇ łťżë(value)Ŕ¸ˇÎ <Ŕ̸§> ¸ĹĹŠˇÎ¸Ś Á¤ŔÇÇŐ´Ď´Ů"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<Ŕ̸§> <şťšŽ>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "<ÇĽÇö˝Ä>+ ŔÇ ¸ĹĹŠˇÎ ČŽŔĺŔť ĂâˇÂÇŐ´Ď´Ů"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<ÇĽÇö˝Ä>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "ÇĽÁŘĂâˇÂŔť <¸íˇÉ>Ŕ¸ˇÎ ş¸łŔ´Ď´Ů"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<¸íˇÉ>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "<ľđˇşĹ与>¸Ś ĂÖťóŔ§ ľđˇşĹ与ˇÎ ťçżëÇŐ´Ď´Ů"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<ľđˇşĹ与>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "ąâşť ¸ĹĹŠˇÎ ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<ĆÄŔĎ:..>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "ąâşť rpmrc ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "ÇöŔç źłÁ¤ľÇžî ŔÖ´Â rpmrcŔÇ łťżë°ú ¸ĹĹŠˇÎ¸Ś ş¸żŠÁÝ´Ď´Ů"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "libio(3) APIŔÇ ťçżëŔť ÇŘÁŚÇŐ´Ď´Ů"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "ľĽŔĚĹÍ ˝şĆŽ¸˛ ÇÁˇÎĹäÄÝŔť ľđšöą× ÇŐ´Ď´Ů"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "rpmio ŔÔ/ĂâˇÂŔť ľđšöą× ÇŐ´Ď´Ů"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "URL Äł˝Ă Çھ鸾Ŕť ľđšöą× ÇŐ´Ď´Ů"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr "ÁúŔÇ żÉźÇ (-q śÇ´Â --query żÉźÇ°ú ÇÔ˛˛ ťçżë):"
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr "°ËÁő żÉźÇ (-V śÇ´Â --verify żÉźÇ°ú ÇÔ˛˛ ťçżë):"
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr "ź­¸í żÉźÇ:"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr "ľĽŔĚĹÍşŁŔĚ˝ş żÉźÇ:"
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"´ŮŔ˝°ú ÇÔ˛˛ ťçżëÇĎ´Â ÁŚŔŰ żÉźÇ [ <specĆÄŔĎ> | <tarĆÄŔĎ> | <źŇ˝ş ĆĐĹ°Áö> ]:"
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr "źłÄĄ/ž÷ą×ˇšŔĚľĺ/ťčÁŚ żÉźÇ:"
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr "¸đľç rpm ¸đľĺżĄź­ŔÇ ŔĎšÝŔűŔÎ żÉźÇ:"
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM šöŔü - %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "ŔĚ ÇÁˇÎą×ˇĽŔş GNU Public License łťżĄź­ ŔÚŔŻˇÓ°Ô ŔçščĆ÷ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "* ťçżëšý: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr "--rcfile żÉźÇŔĚ ÁŚ°ĹľÇžú˝Ŕ´Ď´Ů.\n"
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "´ë˝Ĺ \"--macros <ĆÄŔĎ:..>\" Ŕť ťçżëÇŐ´Ď´Ů.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "ŔÎźö Ăł¸Ž°úÁ¤ (%d) ľľÁß łťşÎ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "ÇĎłŞŔÇ ÁÖ(major) ¸đľĺ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "ÁúŔÇ/°ËÁő ŔŻÇüŔş °˘°˘ ´Ů¸Ľ ŔŻÇü°ú ľż˝ĂżĄ źöÇŕÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "şÎŔűŔýÇŃ ÁúŔÇ ÇáĄą× ŔÔ´Ď´Ů"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "şÎŔűŔýÇŃ ÁúŔÇ Çü˝Ä ŔÔ´Ď´Ů"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "şÎŔűŔýÇŃ ÁúŔÇ źŇ˝ş ŔÔ´Ď´Ů"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath´Â ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ťçżëÇĎÁö žĘąâ Ŕ§ÇŃ żÉźÇŔÔ´Ď´Ů"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "źłÄĄ, ž÷ą×ˇšŔĚľĺ, źŇ˝ş ťčÁŚ, spec ĆÄŔĎ ťčÁŚ˝ĂżĄ¸¸ źöÇŕľË´Ď´Ů"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ĆÄŔĎŔť ŔçščÄĄÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix śÇ´Â --relocate żÉźÇ Áß ÇĎłŞ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate żÍ --excludepath żÉźÇŔş ĂÖ˝ĹŔÇ ĆĐĹ°Áö¸Ś źłÄĄÇŇ ś§żĄ¸¸ ťçżëÇŇ źö ŔÖ"
"˝Ŕ´Ď´Ů"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix żÉźÇŔş ĂÖ˝ĹŔÇ ĆĐĹ°Áö¸Ś źłÄĄÇŇ ś§żĄ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix żÉźÇŔÇ ŔÎźö´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs żÍ --includedocs żÉźÇ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches żÉźÇŔş ĆĐĹ°Áö ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "˝şĹŠ¸łĆŽ ÇŘÁŚ żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "ĆŽ¸Ž°Ĺ ÇŘÁŚ żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -340,13 +341,13 @@ msgstr ""
"--nodeps żÉźÇŔş ĆĐĹ°Áö ÁŚŔŰ, ŔçÁŚŔŰ(rebuild), ŔçÄÄĆÄŔĎ(recompile), źłÄĄ, ťč"
"ÁŚ, °ËÁő˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test żÉźÇŔş ĆĐĹ°Áö źłÄĄ, ťčÁŚ, ÁŚŔ۽ÿĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -354,81 +355,81 @@ msgstr ""
"--root (-r) żÉźÇŔş ĆĐĹ°Áö źłÄĄ, ťčÁŚ, ÁúŔÇ, ľĽŔĚĹÍşŁŔĚ˝ş Ŕ繸Ăŕ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ "
"źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) żÉźÇŔÇ ŔÎźö´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "ź­¸íÇŇ ĆÄŔĎŔĚ žř˝Ŕ´Ď´Ů\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "%s ĆÄŔĎżĄ Á˘ąŮÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp¸Ś ĂŁŔť źö žřŔ˝: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "ĆĐ˝ş ą¸šŽ(pass phrase) ŔÔˇÂ: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "ĆĐ˝ş ą¸šŽ(pass phrase)ŔĚ żĂšŮ¸ŁÁö žĘ˝Ŕ´Ď´Ů\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "ĆĐ˝ş ą¸šŽ(pass phrase)ŔĚ ŔĎÄĄÇŐ´Ď´Ů.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "¸ĹĹŠˇÎ ĆÄŔĎżĄ şÎŔűÇŐÇŃ %%_signatureŔÇ łťżëŔĚ ŔÖ˝Ŕ´Ď´Ů.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign żÉźÇŔş ĆĐĹ°Áö ÁŚŔ۽ÿĄ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "ŔçÁŚŔŰ(rebuild)ÇŇ ĆĐĹ°Áö ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ spec ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ tar ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr "ťčÁŚÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "źłÄĄÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "°ËÁőżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "--querytags żÉźÇżĄ şÎŔűŔýÇŃ ŔÎźö°Ą ÁöÁ¤ľÇžú˝Ŕ´Ď´Ů "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
@@ -1588,45 +1589,59 @@ msgstr "%s(ŔĚ)°Ą %s(Ŕ¸)ˇÎ ťýźşľÇžú˝Ŕ´Ď´Ů\n"
msgid "error creating temporary file %s\n"
msgstr "Ŕӽà ĆÄŔĎ %s(Ŕť)¸Ś ťýźşÇĎ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLeadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ŔĚ RPM šöŔüŔş ĆĐĹ°ÂĄ šöŔü '1' Ŕť ÁöżřÇĎÁö žĘ˝Ŕ´Ď´Ů\n"
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ŔĚ RPM šöŔüŔş ÁÖ šřČŁ(major number)°Ą <= 4 ŔÎ ĆĐĹ°ÂĄ ¸¸Ŕť ÁöżřÇŐ´Ď´Ů\n"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignatureŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ŔŻČżÇŃ ź­¸íŔĚ žř˝Ŕ´Ď´Ů\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLeadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: FreadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "ąâşť ¸ĹĹŠˇÎ ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "ÁŚżÜ˝ĂĹł °ćˇÎ´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
@@ -2014,7 +2029,7 @@ msgstr "ĆÄŔĎŔÇ ¸đľĺ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
msgid "don't verify files in package"
msgstr "ĆĐĹ°Áö žČŔÇ ĆÄŔĎŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
@@ -2182,8 +2197,8 @@ msgstr "ĆĐĹ°ÁöżĄ ĆÄŔĎ źŇŔŻŔÚ śÇ´Â id ¸ńˇĎŔĚ žř˝Ŕ´Ď´Ů\n"
msgid "can't query %s: %s\n"
msgstr "%s(Ŕť)¸Ś ÁúŔÇÇŇ źö žřŔ˝: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s(Ŕť)¸Ś żŠ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
@@ -2197,7 +2212,7 @@ msgstr "%s(Ŕť)¸Ś ÁúŔÇÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
msgid "old format source packages cannot be queried\n"
msgstr "ŔĚŔü Çü˝ÄŔÇ źŇ˝ş ĆĐĹ°Áö´Â ÁúŔÇÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s(żÍ)°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö°Ą žřŔ˝: %s\n"
@@ -2267,7 +2282,7 @@ msgstr "ĆĐĹ°Áö ąâˇĎ(record) šřČŁ: %u\n"
msgid "record %u could not be read\n"
msgstr "ąâˇĎ(record) šřČŁ %u(Ŕş)´Â ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "%s ĆĐĹ°Áö°Ą źłÄĄľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
@@ -2394,6 +2409,40 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "%s ĆĐĹ°ÁöŔÇ ÇĘżäťçÇ×(łťżŞ)ŔĚ ¸¸ÁˇÇĎÁö žĘŔ˝: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr "========== ŔçščÄĄ\n"
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr "%5d ÁŚżÜ %s\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d ŔçščÄĄ %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "%s%s multilib °ćˇÎ¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr "%s %s(Ŕť)¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "%s(Ŕť)¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "%s ľđˇşĹ与¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr "ÁŘşń Áß..."
@@ -2402,82 +2451,83 @@ msgstr "ÁŘşń Áß..."
msgid "Preparing packages for installation..."
msgstr "źłÄĄÇŇ ĆĐĹ°Áö¸Ś ÁŘşńÇĎ°í ŔÖ˝Ŕ´Ď´Ů..."
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "%s(Ŕť)¸Ś şšą¸ÇŐ´Ď´Ů\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr " ... %s(Ŕ¸)ˇÎ\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s(Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů - ŔüźŰ(transfer)żĄ ˝ÇĆĐÇÔ - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s ĆĐĹ°Áö´Â ŔçščÄĄÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "%s ĆÄŔĎŔť ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s ĆÄŔĎŔş ĂֽŠšöŔüŔÇ RPMŔť ÇĘżäˇÎ ÇŐ´Ď´Ů\n"
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s(Ŕş)´Â źłÄĄÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%dŔÇ źŇ˝şżÍ %dŔÇ šŮŔ̳ʸŽ ĆĐĹ°Áö°Ą °ËťöľÇžú˝Ŕ´Ď´Ů\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇŘ ˝ÇĆĐÇÔ:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "šŮŔ̳ʸŽ ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" żŠˇŻ°łŔÇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇŐ´Ď´Ů\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s(Ŕť)¸Ś ż­ źö žřŔ˝: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "%s(Ŕť)¸Ś źłÄĄÇŐ´Ď´Ů\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "(+%d,-%d) ĆĐĹ°Áö¸Ś %sŔ¸ˇÎ ˇŃšé(rollback)ÇŐ´Ď´Ů"
@@ -2487,6 +2537,38 @@ msgstr "(+%d,-%d) ĆĐĹ°Áö¸Ś %sŔ¸ˇÎ ˇŃšé(rollback)ÇŐ´Ď´Ů"
msgid "read failed: %s (%d)\n"
msgstr "ŔĐ´ÂľĽ ˝ÇĆĐÇÔ: %s (%d)\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3029,8 +3111,8 @@ msgstr "%s ŔÎľŚ˝ş¸Ś ż­ źö žř˝Ŕ´Ď´Ů\n"
msgid "no dbpath has been set\n"
msgstr "db°ćˇÎ°Ą źłÁ¤ľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -3041,137 +3123,137 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr "%3$s(Ŕ¸)ˇÎ %2$s ˇšÄھ希 ŔúŔĺÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: źŐťóľČ Çě´ő #%u(ŔĚ)°Ą şšą¸(retrieved)ľÇžú˝Ŕ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%xŔÇ Çě´ő¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
"%3$s ŔÎľŚ˝şżĄź­ \"%2$s\" ˇšÄھ希 žň´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄź­ \"%1$s\"(Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄź­ %1$d Ç׸ńľé(entries)Ŕť ťčÁŚÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
"%3$s ŔÎľŚ˝şżĄź­ \"%2$s\" ˇšÄھ希 žň´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "%3$s(Ŕ¸)ˇÎ %2$s ˇšÄھ希 ŔúŔĺÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "%3$sżĄź­ %2$s ˇšÄھ希 ťčÁŚÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ťőˇÎżî ĆĐĹ°Áö¸Ś ščÄĄÇĎ´Â ľľÁß żŔˇů(%d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄ \"%1$s\"(Ŕť)¸Ś Ăß°ĄÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%2$s ŔÎľŚ˝şżĄ %1$d Ç׸ńľé(entries)Ŕť Ăß°ĄÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "%3$s(Ŕ¸)ˇÎ %2$s ˇšÄھ希 ŔúŔĺÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "db3¸Ś Ŕ繸ĂŕÇŃ ČÄżĄ %s(Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "db°ćˇÎ°Ą źłÁ¤ľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%2$sżĄ %1$s ľĽŔĚĹÍşŁŔĚ˝ş¸Ś Ŕ繸Ăŕ ÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr "Ŕӽà ľĽŔĚĹÍşŁŔĚ˝ş %s(ŔĚ)°Ą ŔĚšĚ Á¸ŔçÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťýźşÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťýźşÇÔ: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "dbapi %dˇÎ ŔĚŔü ľĽŔĚĹÍşŁŔĚ˝ş¸Ś żą´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "dbapi %dˇÎ ťőˇÎżî ľĽŔĚĹÍşŁŔĚ˝ş¸Ś żą´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "ľĽŔĚĹÍşŁŔĚ˝şŔÇ ˇšÄÚľĺ šřČŁ %u(ŔĚ)°Ą Ŕ߸řľÇžú˝Ŕ´Ď´Ů -- ťýˇŤÇŐ´Ď´Ů.\n"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "%użĄ ĂłŔ˝şÎĹÍ ˇšÄھ希 Ăß°ĄÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ľĽŔĚĹÍşŁŔĚ˝ş¸Ś Ŕ繸ĂŕÇĎ´ÂľĽ ˝ÇĆĐÇÔ: żřşť ľĽŔĚĹÍşŁŔĚ˝ş´Â ą×´ëˇÎ ŔŻÁöľË´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "ŔĚŔü ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ťőˇÎżî ľĽŔĚĹÍşŁŔĚ˝şˇÎ ąłĂźÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "şšą¸ÇĎąâ Ŕ§ÇŘ $2$sŔÇ ĆÄŔĎŔť $1$sŔÇ ĆÄŔϡΠąłĂźÇŐ´Ď´Ů"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťčÁŚÇŐ´Ď´Ů\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s ľđˇşĹ与¸Ś ťčÁŚÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
@@ -3384,6 +3466,73 @@ msgstr "URL Ć÷ĆŽ´Â šÝľĺ˝Ă źýŔÚŔĚžîžß ÇŐ´Ď´Ů\n"
msgid "failed to create %s: %s\n"
msgstr "%s(Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "%s ľđˇşĹ与¸Ś ťýźşÇŐ´Ď´Ů\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: ŔĐ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
+
+#: tools/rpmgraph.c:286
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
+msgstr "¸đľç rpm ¸đľĺżĄź­ŔÇ ŔĎšÝŔűŔÎ żÉźÇ:"
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "<şťšŽ>ŔÇ łťżë(value)Ŕ¸ˇÎ <Ŕ̸§> ¸ĹĹŠˇÎ¸Ś Á¤ŔÇÇŐ´Ď´Ů"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<Ŕ̸§> <şťšŽ>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<ÇĽÇö˝Ä>+"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "ŔĚ ĆĐĹ°ÁöľéŔť ÁŚ°ĹÇŇ °ćżě ŔÇÁ¸źşŔĚ ąúÁú źö ŔÖŔ˝:\n"
@@ -3992,9 +4141,6 @@ msgstr "%s(Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "rpm °ËÁő ¸đľĺ (legacy)"
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: ŔĐ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "%s/packages.rpmŔť ż­ źö žř˝Ŕ´Ď´Ů\n"
@@ -4004,27 +4150,6 @@ msgstr "%s(Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "GPG¸Ś ťçżëÇĎżŠ ź­¸íŔť ťýźşÇŐ´Ď´Ů.\n"
-#~ msgid "========== relocations\n"
-#~ msgstr "========== ŔçščÄĄ\n"
-
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "%5d ÁŚżÜ %s\n"
-
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d ŔçščÄĄ %s -> %s\n"
-
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "%s%s multilib °ćˇÎ¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
-
-#~ msgid "excluding %s %s\n"
-#~ msgstr "%s %s(Ŕť)¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "%s(Ŕť)¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "%s ľđˇşĹ与¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
-
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/no.po b/po/no.po
index ab443a1a9..cf7935890 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2001-06-27 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -74,252 +74,253 @@ msgstr "feil under lesing av header fra pakke\n"
msgid "cannot re-open payload: %s\n"
msgstr "kan ikke gjenĺpne \"payload\": %s\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "skriv ut hvilken versjon av rpm som brukes"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "gi mindre detaljert info"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "gi mer detaljert info"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "definer makro <navn> med verdi <kropp>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<navn> <kropp>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "skriv ut makroutvidelsen av <uttr>+"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<uttr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "send stdout til <kmd>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<kmd>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivĺkatalog"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<kat>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "les <fil:...> i stedet for standard makrofil(er)"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "les <fil:...> i stedet for standard rpmrc-fil(er)"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "vis endelig rpmrc og makrokonfigurasjon"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "slĺ av bruk av libio(3) API"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "feilsřking pĺ protokoll-datastrřm"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "feilsřk rpmio I/U"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "feilsřk URL-cache hĺndtering"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versjon %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright Š 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Bruk: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Bruk -e eller --erase i stedet.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "kun ett střrre modi kan spesifiseres"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "én type spřrring/verifisering kan utfřres om gangen"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "uventede flagg for spřrring"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "ventet spřrringsformat"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "uventet spřrringskilde"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath oppgitt for operasjon som ikke bruker en database"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "filer kan kun omplasseres under pakkeinstallasjon"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "kune en av --prefix eller --relocate kan brukes"
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "argumenter til --prefix mĺ begynne med en /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -327,7 +328,7 @@ msgstr ""
"skript som slĺr av alternativer kan kun spesifiseres under pakkeinstallasjon "
"og sletting"
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -335,100 +336,100 @@ msgstr ""
"alternativer som slĺr av utlřsing kan kun spesifiseres under "
"pakkeinstallasjon, og sletting"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "ingen filer ĺ signere\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "kan ikke aksessere fil %s\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp ikke funnet: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Skriv inn passord: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Passordsjekk feilet\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Passord er ok.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "kjřring feilet\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler oppgitt for ombygging"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "ingen spec-fil oppgitt for bygging"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "ingen tar-fil oppgitt for bygging"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "ingen argumenter oppgitt for spřrring"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "ingen argumenter oppgitt for verifisering"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "uventede argumenter til --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "ingen argumenter oppgitt for spřrring"
@@ -1587,45 +1588,59 @@ msgstr "%s opprettet som %s\n"
msgid "error creating temporary file %s\n"
msgstr "feil under oppretting av midlertidig fil %s\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "les <fil:...> i stedet for standard makrofil(er)"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "eksluderingssti mĺ begynne med en /"
@@ -2011,7 +2026,7 @@ msgstr "ikke verifiser modus for filer"
msgid "don't verify files in package"
msgstr "ikke verifiser filer i pakke"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
@@ -2173,8 +2188,8 @@ msgstr "pakken har verken fileier eller id-lister\n"
msgid "can't query %s: %s\n"
msgstr "kan ikke spřrre pĺ %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "feil under ĺpning av %s: %s\n"
@@ -2188,7 +2203,7 @@ msgstr "spřrring pĺ %s feilet\n"
msgid "old format source packages cannot be queried\n"
msgstr "kildepakker i gammelt format kan ikke spřrres\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ingen pakke utlřser %s\n"
@@ -2257,7 +2272,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
@@ -2380,6 +2395,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "pakke %s er i konflikt: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "eksluderer %s %s\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d omplasser %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "ekskluderer multilib-sti %s%s\n"
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr "eksluderer %s %s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "relokerer %s til %s\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "relokerer katalog %s til %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr "Forbereder..."
@@ -2388,82 +2437,83 @@ msgstr "Forbereder..."
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker for installasjon..."
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hopper over %s - overfřring feilet - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, 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:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binćrpakker\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "installerer binćrpakker\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke ĺpne %s: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2473,6 +2523,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "lesing feilet: %s (%d)\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3004,8 +3086,8 @@ msgstr "kan ikke ĺpne %s indeks\n"
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -3015,134 +3097,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "feil(%d) under fjerning av post %s fra %s\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "feil(%d) under fjerning av post %s fra %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "feil(%d) under lagring av post %s til %s\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3354,6 +3436,71 @@ msgstr "url-port mĺ vćre et tall\n"
msgid "failed to create %s: %s\n"
msgstr "kunne ikke opprette %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "verifiser pakkesignatur"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "ikke verifiser pakkeavhengigheter"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "verifiser pakkesignatur"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: lesing av manifest feilet: %s\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "definer makro <navn> med verdi <kropp>"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<navn> <kropp>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<uttr>+"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "fjerning av disse pakkene vil řdelegge avhengigheter:\n"
@@ -3906,27 +4053,9 @@ msgstr "kunne ikke opprette %s: %s\n"
#~ msgid "package %s conflicts: %s\n"
#~ msgstr "pakke %s er i konflikt: %s\n"
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: lesing av manifest feilet: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "kan ikke ĺpne %s/packages.rpm\n"
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d omplasser %s -> %s\n"
-
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "ekskluderer multilib-sti %s%s\n"
-
-#~ msgid "excluding %s %s\n"
-#~ msgstr "eksluderer %s %s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "relokerer %s til %s\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "relokerer katalog %s til %s\n"
-
#~ msgid "cannot get %s lock on database\n"
#~ msgstr "kan ikke ĺpne pakkedatabase i %s\n"
diff --git a/po/pl.po b/po/pl.po
index 8ac31b28b..b5fe5d5a6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -81,270 +81,270 @@ 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:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "wyświetl wersję używanego rpm-a"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "wyświetl wersję używanego rpm-a"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "przekaż standartowe wyjście do <komenda>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "użyj <katalogu> jako katalogu najwyższego poziomu"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
#, fuzzy
msgid "Signature options:"
msgstr "Rozmiar sygnatury: %d\n"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "plik %s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM wersja %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Program może być swobodnie rozpowszechniany na warunkach licencji GNU"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Użycie: rpm {--help}"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Użyj -e lub --erase\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Błąd wewnętrzny w przetwarzaniu argumentu (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "tylko jeden główny tryb pracy może być podany"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "tylko jeden typ odpytywania/sprawdzania można wykonać na raz"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "błędna konstrukcja argumentów odpytywania"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "błędna konstrukcja argumentów odpytywania"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "błędna konstrukcja argumentów odpytywania"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath podano dla operacji nie używającej bazy"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "tylko instalację, uaktualnienie i usuwanie źródeł można wymusić"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "przesuwania plików można dokonać tylko w trakcie instalacji"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "nie można jednocześnie użyć --prefix i --relocate"
-#: rpmqv.c:752
+#: rpmqv.c:750
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"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix można użyć tylko w trakcie instalacji nowych pakietów"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty dla --prefix muszą się rozpoczynać od /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "nie można jednocześnie użyć --excludedocs i --includedocs"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches można użyć tylko w trakcie usuwania pakietów"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles można użyć tylko w trakcie instalacji pakietów"
-#: rpmqv.c:812
+#: rpmqv.c:810
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"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options 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:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options 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:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -353,14 +353,14 @@ msgstr ""
"--nodeps można użyć tylko w trakcie budowania, instalacji, usuwania lub "
"sprawdzania pakietów"
-#: rpmqv.c:831
+#: rpmqv.c:829
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"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -368,82 +368,82 @@ msgstr ""
"--root (-r) można użyć tylko w trakcie instalacji, usuwania, sprawdzania "
"pakietów lub przebudowywania bazy"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty dla --root (-r) muszą się rozpoczynać od /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "brak dostępu do pliku %s\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "nie znaleziono pgp: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Podaj hasło: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Weryfikacja hasła nieudana\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Hasło jest prawidłowe.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Błędny %%_signature spec w pliku makra.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign można użyć tylko w trakcie budowania pakietu"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "wykonanie nie powiodło się\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do budowania"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "nie podano nazw plików tar do budowania"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytań"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "nie podano argumentów dla trybu zapytań"
@@ -1632,49 +1632,62 @@ msgstr "ostrzeżenie: %s utworzony jako %s"
msgid "error creating temporary file %s\n"
msgstr "błąd w tworzeniu pliku tymczasowego %s"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead nie powiodło się\n"
-#: lib/package.c:187
+#: lib/package.c:224
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tylko pakiety z numerem głównym <= 3 są obsługiwane przez tą wersję RPM'a"
-#: lib/package.c:195
+#: lib/package.c:232
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"tylko pakiety z numerem głównym <= 3 są obsługiwane przez tą wersję RPM'a"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature nie powiodło się\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Sygnatura nie jest dostępna\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead nie powiodło się\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiodło się\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "ścieżki wyłączeń muszą się zaczynać od /"
@@ -2087,7 +2100,7 @@ msgstr "nie sprawdzaj plików pakietu"
msgid "don't verify files in package"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "nie sprawdzaj zależności pakietu"
@@ -2255,8 +2268,8 @@ msgstr "pakiet nie ma ani właściciela pliku ani list id"
msgid "can't query %s: %s\n"
msgstr "nie można odwiązać %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s nie powiodło się\n"
@@ -2270,7 +2283,7 @@ msgstr "odpytywanie %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:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "żaden pakiet nie zahacza %s\n"
@@ -2340,7 +2353,7 @@ msgstr "numer rekordu pakietu: %d\n"
msgid "record %u could not be read\n"
msgstr "nie można odczytać rekordu %d\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2466,6 +2479,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "zależności pakietu %s nie zostały spełnione: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "Ten OS nie jest wspierany: %s"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "przesuwanie %s do %s\n"
+
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "wyłączanie %s\n"
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "wyłączanie %s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "przesuwanie %s do %s\n"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "przesuwanie %s do %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2475,82 +2522,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nie podano nazw plików do zainstalowania"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, 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:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiodła się\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "błąd czytania z pliku %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie może być zainstalowany\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, 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:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "niespełnione zależności:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie można otworzyć pliku %s: %s"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" określa wiele pakietów\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie można otworzyć %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2560,6 +2608,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "odczyt nie powiódł się: %s (%d)"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3104,8 +3184,8 @@ msgstr "nie można otworzyć %s\n"
msgid "no dbpath has been set\n"
msgstr "ścieżka bazy danych nie została podana"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "błąd pobierania rekordu %s z %s"
@@ -3115,135 +3195,135 @@ msgstr "błąd pobierania rekordu %s z %s"
msgid "error(%d) storing record #%d into %s\n"
msgstr "błąd zapisywania rekordu %s do %s"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "nie można odczytać nagłówka przy %d dla poszukiwania"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "błąd pobierania rekordu %s z %s"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "usuwanie indeksu grupy\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "usuwanie indeksu nazw\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "błąd pobierania rekordu %s z %s"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "błąd zapisywania rekordu %s do %s"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "błąd usuwania rekordu %s z %s"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "błąd szukania pakietu %s\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "błąd zapisywania rekordu %s do %s"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "ścieżka bazy danych nie została podana"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "odbudowywuję bazę danych w rootdir %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "tymczasowa baza danych %s już istnieje"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otwieranie starej bazy danych\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otwieranie nowej bazy danych\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "rekord numer %d w bazie danych jest błędny -- rekord pominięto"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie można dodać rekordu oryginalnie przy %d"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "przebudowanie bazy nie powiodło się; stara pozostała na miejscu\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "zamiana starej bazy na nową nie powiodła się!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "naprawcze zastępowanie plików w %s plikami z %s"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
@@ -3459,6 +3539,63 @@ msgstr "port musi być liczbą\n"
msgid "failed to create %s: %s\n"
msgstr "utworzenie %s nie powiodło się\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "sprawdź sygnaturę pakietu"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "nie sprawdzaj zależności pakietu"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "sprawdź sygnaturę pakietu"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "tworzenie katalogu: %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: readLead nie powiodło się\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "usunięcie tych pakietów zerwie zależności:\n"
@@ -4073,10 +4210,6 @@ msgstr "utworzenie %s nie powiodło się\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "tryb odpytywania"
-#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: readLead nie powiodło się\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "nie można otworzyć %s/packages.rpm\n"
@@ -4089,29 +4222,6 @@ msgstr "utworzenie %s nie powiodło się\n"
#~ msgstr "Generowanie sygnatury: %d\n"
#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "Ten OS nie jest wspierany: %s"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "przesuwanie %s do %s\n"
-
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "wyłączanie %s\n"
-
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "wyłączanie %s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "przesuwanie %s do %s\n"
-
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "przesuwanie %s do %s\n"
-
-#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 6f31426bb..6d0628c8a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2002-02-14 10:51+0000\n"
"Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
"Language-Team: pt <morais@kde.org\n"
@@ -74,255 +74,256 @@ msgstr "erro ao ler o cabeçalho do pacote\n"
msgid "cannot re-open payload: %s\n"
msgstr "năo consigo aceder de novo ao conteúdo: %s\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "imprime a versăo do RPM que está a usar"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "devolver um resultado menos detalhado"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "devolver um resultado mais detalhado"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "define a macro <nome> com o valor <conteúdo>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<nome> <cabeç>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "imprimir a expansăo da macro <expr>+"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "manda o stdout para <cmd>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<com>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "usa <dir> como a directoria de topo"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<dir>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "ler o <fich:...> em vez do(s) ficheiro(s) de macros por omissăo"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<fich:...>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "ler o <fich:...> em vez do(s) ficheiro(s) rpmrc por omissăo"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "mostra a configuraçăo final do rpmrc e das macros"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "desactivar o uso da API da libio(3)"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "depurar a sequęncia de dados do protocolo"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "depurar a E/S da rpmio"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "depurar a gestăo da 'cache' de URLs"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr "Opçőes de pesquisa (com o -q ou o --query):"
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr "Opçőes de verificaçăo (com o -V ou o --verify):"
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr "Opçőes de assinatura:"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr "Opçőes da base de dados:"
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Opçőes de criaçăo com [ <fich spec> | <fich tar> | <pacote fonte> ]:"
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr "Opçőes de Instalaçăo/Actualizaçăo/Remoçăo:"
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr "Opçőes comuns para todos os modos do rpm:"
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versăo %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Este programa pode ser distribuído livremente sob os termos da GPL da GNU"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Utilizaçăo: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr "A opçăo --rcfile foi eliminada.\n"
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Usar o \"--macros <fich:...>\" em alternativa.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "só pode ser especificado um 'major mode'"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "só pode ser realizado um tipo de pesquisa/verificaçăo de cada vez"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "opçőes de pesquisa inesperadas"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "formato de pesquisa inesperado"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "origem de pesquisa inesperada"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "o --dbpath foi usado numa operaçăo que năo precisa duma base de dados"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"só a instalaçăo, a actualizaçăo, o rmsource e o rmpspec podem ser forçados"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
"os ficheiros só podem ser mudados de sítio durante a instalaçăo do pacote"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "só uma das opçőes --prefix ou --relocate pode ser usada"
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"o --relocate e o --excludepath só podem ser usados ao instalar pacotes novos"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "o --prefix só pode ser usado ao instalar pacotes novos"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "os argumentos do --prefix tęm de começar por /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "o --hash (-h) só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "o --percent só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "o --replacefiles só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "o --replacepkgs só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "o --excludedocs só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "o --includedocs só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "só uma das opçőes --excludedocs e --includedocs pode ser usada"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "o --ignorearch só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "o --ignoreos só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "o --ignoresize só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "o --allmatches só pode ser indicado ao apagar o pacote"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "o --allfiles só pode ser indicado durante a instalaçăo do pacote"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"o --justdb só pode ser indicado durante a instalaçăo ou a remoçăo do pacote"
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -330,7 +331,7 @@ msgstr ""
"a desactivaçăo de 'scripts' só pode ser indicado durante a instalaçăo ou a "
"remoçăo de pacotes"
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -338,7 +339,7 @@ msgstr ""
"a desactivaçăo dos 'triggers' só pode ser usado durante a instalaçăo ou "
"remoçăo de pacotes"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -346,7 +347,7 @@ msgstr ""
"o --nodeps só pode ser indicado durante a criaçăo, reconstruçăo, "
"recompilaçăo, instalaçăo, remoçăo ou verificaçăo do pacote"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -354,7 +355,7 @@ msgstr ""
"o --test só pode ser indicado durante a instalaçăo, remoçăo ou criaçăo do "
"pacote"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -362,81 +363,81 @@ msgstr ""
"o --root (-r) só pode ser indicado durante a instalaçăo, remoçăo ou pesquisa "
"do pacote ou na reconstruçăo da base de dados"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "os argumentos do --root (-r) tęm de começar por /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "năo existem ficheiros a assinar\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "năo consigo aceder ao ficheiro %s\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp năo encontrado: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Indique a palavra-chave: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "A verificaçăo da palavra-chave falhou\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "A palavra-chave está correcta.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Spec %%_signature inválido no ficheiro de macros.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "o --sign só pode ser usado na criaçăo do pacote"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "o exec falhou\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "năo foram indicados pacotes para a reconstruçăo"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "năo foram indicados ficheiros spec para a criaçăo"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "năo foram indicados ficheiros tar para a criaçăo"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr "năo foram indicados pacotes para apagar"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "năo foram indicados pacotes para instalar"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "năo foram indicados argumentos para a pesquisa"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "năo foram indicados argumentos para a verificaçăo"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "argumentos inesperados no --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "năo foram indicados argumentos para a pesquisa"
@@ -1605,45 +1606,59 @@ msgstr "%s criado como %s\n"
msgid "error creating temporary file %s\n"
msgstr "erro ao criar o ficheiro temporário %s\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "a versăo 1 dos pacotes năo é suportada por esta versăo do RPM\n"
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "só os pacotes com versăo <= 4 săo suportados por esta versăo do RPM\n"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: o rpmReadSignature falhou\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nenhuma assinatura disponível\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "ler o <fich:...> em vez do(s) ficheiro(s) de macros por omissăo"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "as directorias de exclusăo tęm de começar por /"
@@ -2029,7 +2044,7 @@ msgstr "năo verificar o modo dos ficheiros"
msgid "don't verify files in package"
msgstr "năo verificar os ficheiros no pacote"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "năo verificar as dependęncias do pacote"
@@ -2194,8 +2209,8 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
msgid "can't query %s: %s\n"
msgstr "năo consigo pesquisar o %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "o acesso ao %s falhou: %s\n"
@@ -2210,7 +2225,7 @@ msgid "old format source packages cannot be queried\n"
msgstr ""
"os pacotes com código-fonte no formato antigo năo podem ser pesquisados\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "nenhum pacote coincide com %s: %s\n"
@@ -2279,7 +2294,7 @@ msgstr "número de registo do pacote: %u\n"
msgid "record %u could not be read\n"
msgstr "o registo %u năo pôde ser lido\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s năo está instalado\n"
@@ -2406,6 +2421,40 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "o pacote %s tem requisitos năo satisfeitos: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr "========== mudanças de local\n"
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr "%5d excluir o %s\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d mudar de local %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "a exclur a directoria 'multilib' %s%s\n"
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr "a excluir o %s %s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "a mudar o %s para %s\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "a mudar a directoria %s para %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr "A preparar..."
@@ -2414,82 +2463,83 @@ msgstr "A preparar..."
msgid "Preparing packages for installation..."
msgstr "A preparar os pacotes para a instalaçăo..."
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "A obter o %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr " ... como %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "a ignorar o %s - a transferęncia falhou - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "o pacote %s năo pode ser mudado de sítio\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler do ficheiros %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "o %s precisa duma versăo mais recente do RPM\n"
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "o %s năo pode ser instalado\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "encontrados %d pacotes com código-fonte e %d binários\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "dependęncias falhadas:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "a instalar os pacotes binários\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "năo consigo aceder ao ficheiro %s: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "o \"%s\" especifica vários pacotes\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "năo consigo aceder ao %s: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "A instalar o %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "a efectuar o 'rollback' (+%d,-%d) pacotes para %s"
@@ -2499,6 +2549,38 @@ msgstr "a efectuar o 'rollback' (+%d,-%d) pacotes para %s"
msgid "read failed: %s (%d)\n"
msgstr "a leitura falhou: %s (%d)\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3038,8 +3120,8 @@ msgstr "năo consigo abrir o índice do %s\n"
msgid "no dbpath has been set\n"
msgstr "năo foi definido o dbpath\n"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
@@ -3049,135 +3131,135 @@ msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
msgid "error(%d) storing record #%d into %s\n"
msgstr "erro(%d) ao guardar o registo %s em %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: năo consigo ler o cabeçalho em 0x%x\n"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "a remover o \"%s\" do índice %s.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "a remover %d registos do índice %s.\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "erro(%d) ao guardar o registo %s em %s\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "erro(%d) ao remover o registo %s do %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "erro(%d) ao criar uma nova instância do pacote\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "a adicionar o \"%s\" ao índice %s.\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "a adicionar %d registos ao índice %s.\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "erro(%d) ao guardar o registo %s em %s\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "a remover o %s depois duma reconstruçăo bem sucedida do db3.\n"
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "năo foi definido o dbpath"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "a reconstruir a base de dados %s em %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr "A base de dados temporária %s já existe\n"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr "a criar a directoria %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr "a criar a directoria %s: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "a abrir a base de dados antiga com a dbapi %d\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "a abrir a base de dados nova com a dbapi %d\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "năo consigo adicionar o registo originalmente em %u\n"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"falhou a reconstruçăo da base de dados: a base de dados original mantém-se\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "falhou a substituiçăo da base de dados antiga pela nova!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr "a remover a directoria %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "falhou a remoçăo da directoria %s: %s\n"
@@ -3389,6 +3471,73 @@ msgstr "o porto do URL tem de ser um número\n"
msgid "failed to create %s: %s\n"
msgstr "năo consegui criar o %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "verificar a assinatura do pacote"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "năo verificar as dependęncias do pacote"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "verificar a assinatura do pacote"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "a criar a directoria %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: a leitura do manifesto falhou: %s\n"
+
+#: tools/rpmgraph.c:286
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
+msgstr "Opçőes comuns para todos os modos do rpm:"
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "define a macro <nome> com o valor <conteúdo>"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<nome> <cabeç>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<expr>+"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "a remoçăo destes pacotes irá quebrar dependęncias:\n"
@@ -3992,9 +4141,6 @@ msgstr "năo consegui criar o %s: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "modo de verificaçăo do rpm (antigo)"
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: a leitura do manifesto falhou: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "năo consigo abrir %s/packages.rpm\n"
@@ -4004,27 +4150,6 @@ msgstr "năo consegui criar o %s: %s\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "A gerar a assinatura usando o PGP.\n"
-#~ msgid "========== relocations\n"
-#~ msgstr "========== mudanças de local\n"
-
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "%5d excluir o %s\n"
-
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d mudar de local %s -> %s\n"
-
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "a exclur a directoria 'multilib' %s%s\n"
-
-#~ msgid "excluding %s %s\n"
-#~ msgstr "a excluir o %s %s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "a mudar o %s para %s\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "a mudar a directoria %s para %s\n"
-
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f0180469b..c7ec33ee0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
#: build.c:40
#, fuzzy
@@ -77,114 +77,114 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "mostra a verso do programa rpm sendo usado"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "mostra a verso do programa rpm sendo usado"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "envia a saida padro para <cmd>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "use <diretrio> como diretrio raiz"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
# , c-format
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "No consegui ler o arquivo spec de %s\n"
@@ -197,160 +197,160 @@ msgstr "No consegui ler o arquivo spec de %s\n"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verso %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
"Este Software pode ser livremente redistribuido sob os termos da Licensa "
"Pblica GNU (GPL)"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "uso: rpm {--help}"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Use -e ou --erase no lugar.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "somente um modo principal pode ser especificado"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "um tipo de pesquisa/verificao pode ser feita por vez"
-#: rpmqv.c:691
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query flags"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:694
+#: rpmqv.c:692
#, fuzzy
msgid "unexpected query format"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "fonte de pesquisa no esperado"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath passado para uma operao que no usa um banco de dados"
-#: rpmqv.c:744
+#: rpmqv.c:742
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "somente instalao e atualizao podem ser foradas"
-#: rpmqv.c:746
+#: rpmqv.c:744
#, fuzzy
msgid "files may only be relocated during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:749
+#: rpmqv.c:747
#, fuzzy
msgid "only one of --prefix or --relocate may be used"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpmqv.c:752
+#: rpmqv.c:750
#, 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"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "argumentos para --prefix devem comear com uma /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
"--hash (-h) somente podem ser especificado durante instalaes de pacotes"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
"--replacepkgs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
"--excludedocs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
"--includedocs somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
"--ignorearch somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:799
+#: rpmqv.c:797
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
"--allmatches somente pode ser especificado durante desinstalaes de pacotes"
-#: rpmqv.c:807
+#: rpmqv.c:805
#, fuzzy
msgid "--allfiles may only be specified during package installation"
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-#: rpmqv.c:812
+#: rpmqv.c:810
#, fuzzy
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
@@ -359,7 +359,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
@@ -368,7 +368,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -377,7 +377,7 @@ msgstr ""
"--nodeps somente pode ser especificado durante [des]instalaes e verificaes "
"de pacotes"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -385,7 +385,7 @@ msgstr ""
"--test somente pode ser especificado durante [des]instalaes e construes de "
"pacotes"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -393,84 +393,84 @@ msgstr ""
"--root (-r) somente pode ser especificado durante [des]instalaes, pesquisas "
"e reconstruo de bancos de dados"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumentos para --root (-r) devem comear com uma /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
#, fuzzy
msgid "pgp not found: "
msgstr "no foi passado pacote para desinstalao"
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Checagem de pass phrase falhou\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Pass phrase ok.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign somente pode ser usado durante a construo de pacotes"
-#: rpmqv.c:936
+#: rpmqv.c:934
#, fuzzy
msgid "exec failed\n"
msgstr "Construo falhou.\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "no foram passados pacotes para reconstruo"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "no foi passado arquivo spec para construo"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "no foram passados arquivos tar para construo"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "no foi passado pacote para instalao"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "no foi passado pacote para instalao"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "no foi passado argumento para pesquisa"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "no foi passado argumento para verificao"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "argumentos no esperados em --querytags"
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "no foi passado argumento para pesquisa"
@@ -1750,47 +1750,60 @@ msgstr "No consegui abrir: %s\n"
msgid "error creating temporary file %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
# , c-format
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
# , c-format
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
#, fuzzy
msgid "exclude paths must begin with a /"
@@ -2212,7 +2225,7 @@ msgstr "instale pacote"
msgid "don't verify files in package"
msgstr "instale pacote"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "no verifique as dependncias do pacote"
@@ -2384,8 +2397,8 @@ msgstr "no foi passado pacote para instalao"
msgid "can't query %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "Construo falhou.\n"
@@ -2399,7 +2412,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "no foram passados pacotes para assinatura"
@@ -2470,7 +2483,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "no foi passado pacote para instalao"
@@ -2602,6 +2615,67 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "no foi passado pacote para instalao"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "RPM verso %s\n"
+
+# , c-format
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "No consegui abrir: %s\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "RPM verso %s\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "RPM verso %s\n"
+
+# , c-format
+#: lib/rpmfi.c:714
+#, fuzzy, c-format
+msgid "relocating %s to %s\n"
+msgstr "No consegui abrir: %s\n"
+
+# , c-format
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "No consegui abrir: %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2619,85 +2693,86 @@ msgstr "no foi passado pacote para instalao"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, fuzzy, c-format
msgid "Retrieving %s\n"
msgstr "RPM verso %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "lista dependncias do pacote"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
# , c-format
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
# , c-format
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "no foi passado pacote para desinstalao"
@@ -2708,6 +2783,38 @@ msgstr "no foi passado pacote para desinstalao"
msgid "read failed: %s (%d)\n"
msgstr "No consegui abrir: %s\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3268,8 +3375,8 @@ msgid "no dbpath has been set\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "No consegui abrir: %s\n"
@@ -3280,133 +3387,133 @@ msgstr "No consegui abrir: %s\n"
msgid "error(%d) storing record #%d into %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "no foi passado pacote para desinstalao"
# , c-format
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "no foi passado pacote para instalao"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
@@ -3419,13 +3526,13 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "RPM verso %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -3640,6 +3747,65 @@ msgstr ""
msgid "failed to create %s: %s\n"
msgstr "No consegui abrir o pipe tar: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "verifique a assinatura do pacote"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "no verifique as dependncias do pacote"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "verifique a assinatura do pacote"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+# , c-format
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "No consegui abrir: %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+# , c-format
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "No consegui abrir: %s\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
#, fuzzy
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "lista dependncias do pacote"
@@ -4206,11 +4372,6 @@ msgstr "No consegui abrir o pipe tar: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "modo pesquisa"
-# , c-format
-#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "No consegui abrir: %s\n"
-
#, fuzzy
#~ msgid "Generating signature using PGP.\n"
#~ msgstr "gere assinatura PGP"
@@ -4219,52 +4380,6 @@ msgstr "No consegui abrir o pipe tar: %s\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "gere assinatura PGP"
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "RPM verso %s\n"
-
-# , c-format
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "No consegui abrir: %s\n"
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "RPM verso %s\n"
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "RPM verso %s\n"
-
-# , c-format
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "No consegui abrir: %s\n"
-
#, fuzzy
#~ msgid "opening db file %s mode 0x%x\n"
#~ msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
diff --git a/po/ro.po b/po/ro.po
index 1667f3ace..461dd63a7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -73,353 +73,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1564,45 +1564,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1974,7 +1987,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2131,8 +2144,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2146,7 +2159,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2215,7 +2228,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2338,6 +2351,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2346,81 +2393,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2430,6 +2478,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2957,8 +3037,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2968,134 +3048,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3306,3 +3386,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 909d550a5..e0ef4ed3d 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -79,353 +79,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1570,45 +1570,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1980,7 +1993,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2137,8 +2150,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2152,7 +2165,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2221,7 +2234,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2344,6 +2357,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2352,81 +2399,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2436,6 +2484,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2963,8 +3043,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2974,134 +3054,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3312,3 +3392,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index b32007e1e..c1cda1ca5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2002-04-09 16:44-0400\n"
"Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -76,258 +76,259 @@ msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÚÁÇĎĚĎ×ËÁ ÉÚ ĐÁËĹÔÁ\n"
msgid "cannot re-open payload: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎ×ÔĎŇÎĎ ĎÔËŇŮÔŘ payload: %s\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "×Ů×ĹÓÔÉ ÎĎÍĹŇ ×ĹŇÓÉÉ ÜÔĎĘ ĐŇÇŇÁÍÍŮ"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "×Ů×ĎÄÉÔŘ ÍÉÎÉÍŐÍ ÓĎĎÂÝĹÎÉĘ"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "×Ů×ĎÄÉÔŘ ÂĎĚĹĹ ÄĹÔÁĚŘÎŮĹ ÓĎĎÂÝĹÎÉŃ"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "ĎĐŇĹÄĹĚÉÔŘ ÍÁËŇĎÓ <ÉÍŃ> ÓĎ ÚÎÁŢĹÎÉĹÍ <ĐĎÄÓÔÁÎĎ×ËÁ>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<ÉÍŃ> <ĐĎÄÓÔÁÎĎ×ËÁ>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "×Ů×ĹÓÔÉ ÚÎÁŢĹÎÉĹ ÍÁËŇĎÓÁ <ÉÍŃ>+"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<ÉÍŃ>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "ĐĎÓĚÁÔŘ ÓÔÁÎÄÁŇÔÎŮĘ ×Ů×ĎÄ × <cmd>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<ËĎÍÁÎÄÁ>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<ËÁÔÁĚĎÇ>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ÍÁËŇĎĆÁĘĚÁ(Ď×) ĐĎ ŐÍĎĚŢÁÎÉŔ"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<ĆÁĘĚ:...>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ ĐĎ ŐÍĎĚŢÁÎÉŔ"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "ĐĎËÁÚÁÔŘ ÔĹËŐÝĹĹ ÚÎÁŢĹÎÉĹ rpmrc É ÍÁËŇĎÓĎ×"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "ÚÁĐŇĹÔÉÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÉĹ libio(3) API"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "ĎÔĚÁÄËÁ ĐŇĎÔĎËĎĚÁ ĐĎÔĎËÁ ÄÁÎÎŮČ"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "ĎÔĚÁÄËÁ ĐŇĎĂĹÓÓÁ ××ĎÄÁ/×Ů×ĎÄÁ rpmio"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "ĎÔĚÁÄËÁ ĎÂŇÁÂĎÔËÉ URL ËÜŰ"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr "đÁŇÁÍĹÔŇŮ ÚÁĐŇĎÓÁ (Ó -q ÉĚÉ --query):"
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr "đÁŇÁÍĹÔŇŮ ĐŇĎ×ĹŇËÉ (Ó -V ÉĚÉ --verify):"
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr "đÁŇÁÍĹÔŇŮ ĐĎÄĐÉÓÉ:"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr "đÁŇÁÍĹÔŇŮ ÂÁÚŮ ÄÁÎÎŮČ"
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"đÁŇÁÍĹÔŇŮ ÓÂĎŇËÉ Ó [ <ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ> | <ÔÁŇ ÁŇČÉ×> | <ÉÓČĎÄÎŮĘ ĐÁËĹÔ> ]:"
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr "đÁŇÁÍĹÔŇŮ őÓÔÁÎĎ×ËÉ/ďÂÎĎ×ĚĹÎÉŃ/őÄÁĚĹÎÉŃ:"
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ×:"
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM ×ĹŇÓÉŃ %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "üÔŐ ĐŇĎÇŇÁÍÍŐ ÍĎÖÎĎ Ó×ĎÂĎÄÎĎ ŇÁÓĐŇĎÓÔŇÁÎŃÔŘ ÎÁ ŐÓĚĎ×ÉŃČ GNU GPL"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "éÓĐĎĚŘÚĎ×ÁÎÉĹ: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr "×ÁŇÉÁÎÔ --rcfile ÂĎĚŘŰĹ ÎĹ ÉÓĐĎĚŘÚŐĹÔÓŃ.\n"
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "÷ÍĹÓÔĎ ÜÔĎÇĎ ÉÓĐĎĚŘÚŐĘÔĹ \"--macros <ĆÁĘĚ:...>\".\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ ĐŇÉ ĎÂŇÁÂĎÔËĹ ÁŇÇŐÍĹÎÔĎ× (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĎÓÎĎ×ÎŮČ ŇĹÖÉÍĎ×"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "ÚÁ ĎÄÉÎ ŇÁÚ ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚÎĹÎ ÔĎĚŘËĎ ĎÄÉÎ ÔÉĐ ĐŇĎ×ĹŇËÉ ÉĚÉ ÚÁĐŇĎÓÁ"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ĆĚÁÇÉ ÚÁĐŇĎÓÁ"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ĆĎŇÍÁÔ ÚÁĐŇĎÓÁ"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ÉÓÔĎŢÎÉË ÚÁĐŇĎÓÁ"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "ĐÁŇÁÍĹÔŇ --dbpath ÚÁÄÁÎ ÄĚŃ ĎĐĹŇÁĂÉÉ, ÎĹ ÉÓĐĎĚŘÚŐŔÝĹĘ ÂÁÚŐ ÄÁÎÎŮČ"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"ĐŇÉÎŐÄÉÔĹĚŘÎŮÍÉ ÍĎÇŐÔ ÂŮÔŘ ÔĎĚŘËĎ ŐÓÔÁÎĎ×ËÁ, ĎÂÎĎ×ĚĹÎÉĹ, ŐÄÁĚĹÎÉĹ ÉÓČĎÄÎÉËĎ× "
"É ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "ĆÁĘĚŮ ÍĎÇŐÔ ÂŮÔŘ ĐĹŇĹÍĹÝĹÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
"ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ×ÁŇÉÁÎÔĎ× --prefix ÉĚÉ --relocate"
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"×ÁŇÉÁÎÔŮ --relocate É --excludepath ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ "
"ÎĎ×ŮČ ĐÁËĹÔĎ×"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "×ÁŇÉÁÎÔ --prefix ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÎĎ×ŮČ ĐÁËĹÔĎ×"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --prefix ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
"ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĐÁŇÁÍĹÔŇĎ× --excludedocs ÉĚÉ --"
"includedocs"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -335,7 +336,7 @@ msgstr ""
"ĐÁŇÁÍĹÔŇŮ ÚÁĐŇĹÔÁ ÓĂĹÎÁŇÉĹ× ÍĎÇŐÔ ÂŮÔŘ ŐËÁÚÁÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ "
"ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -343,7 +344,7 @@ msgstr ""
"ĐÁŇÁÍĹÔŇŮ ÚÁĐŇĹÔÁ ÔŇÉÇÇĹŇĎ× ÍĎÇŐÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ "
"ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ(Ď×)"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -351,14 +352,14 @@ msgstr ""
"--nodeps ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ, ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ĐŇĎ×ĹŇËÉ "
"ĐÁËĹÔĎ×"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ÓÂĎŇËĹ ĐÁËĹÔÁ"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -366,81 +367,81 @@ msgstr ""
"--root (-r) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ, ÚÁĐŇĎÓÁČ "
"ĐÁËĹÔÁ É ĐĹŇĹÓÔŇĎĹÎÉÉ ÂÁÚŮ ÄÁÎÎŮČ"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --root (-r) ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "ÎĹÔ ĆÁĘĚĎ× ÄĚŃ ĐĎÄĐÉÓÉ\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "ÎĹÔ ÄĎÓÔŐĐÁ Ë ĆÁĘĚŐ %s\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp ÎĹ ÎÁĘÄĹÎ: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "÷×ĹÄÉÔĹ ËĚŔŢĹ×ŐŔ ĆŇÁÚŐ: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "îĹ×ĹŇÎÁŃ ËĚŔŢĹ×ÁŃ ĆŇÁÚÁ\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "ëĚŔŢĹ×ÁŃ ĆŇÁÚÁ ĐŇÉÎŃÔÁ.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "ÚÁĐŐÓË ÎĹ ŐÄÁĚÓŃ\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĹŇĹÓÂĎŇËÉ"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "ÎĹ ÚÁÄÁÎ ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÄĚŃ ×ĹŇÉĆÉËÁĂÉÉ"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ÁŇÇŐÍĹÎÔŮ ÄĚŃ --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
@@ -1610,45 +1611,59 @@ msgstr "%s ÓĎÚÄÁÎ ËÁË %s\n"
msgid "error creating temporary file %s\n"
msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ×ŇĹÍĹÎÎĎÇĎ ĆÁĘĚÁ %s\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ĎŰÉÂËÁ readLead\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ĐÁËĹÔŮ ×ĹŇÓÉÉ 1 ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ ÜÔĎĘ ×ĹŇÓÉĹĘ RPM\n"
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÜÔÁ ×ĹŇÓÉŃ RPM ĐĎÄÄĹŇÖÉ×ÁĹÔ ÔĎĚŘËĎ ĐÁËĹÔŮ ×ĹŇÓÉÉ <= 4\n"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ĎŰÉÂËÁ rpmReadSignature\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: đĎÄĐÉÓŘ ÎĹÄĎÓÔŐĐÎÁ\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ĎŰÉÂËÁ readLead\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ĎŰÉÂËÁ Fread: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ÍÁËŇĎĆÁĘĚÁ(Ď×) ĐĎ ŐÍĎĚŢÁÎÉŔ"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "ÉÓËĚŔŢĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
@@ -2033,7 +2048,7 @@ msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐŇÁ×Á ÄĎÓÔŐĐÁ ĆÁĘĚĎ× ĐÁËĹÔÁ"
msgid "don't verify files in package"
msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ĐÁËĹÔÁ"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
@@ -2196,8 +2211,8 @@ msgstr "ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ÓĐÉÓËĎ× ÎÉ ČĎÚŃĹ× ĆÁĘĚĎ×, ÎÉ ÉČ ID\n"
msgid "can't query %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁĐŇĎÓÉÔŘ %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
@@ -2211,7 +2226,7 @@ msgstr "ĎŰÉÂËÁ ÚÁĐŇĎÓÁ %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "ÚÁĐŇĎÓŮ Ë ÉÓČĎÄÎŮÍ ĐÁËĹÔÁÍ × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ÎÉ ĎÄÉÎ ĐÁËĹÔ ÎĹ ĐĎÄČĎÄÉÔ Ë %s: %s\n"
@@ -2280,7 +2295,7 @@ msgstr "ÎĎÍĹŇ ÚÁĐÉÓÉ ĐÁËĹÔÁ: %u\n"
msgid "record %u could not be read\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁĐÉÓŘ %u\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
@@ -2407,6 +2422,40 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "ĐÁËĹÔ %s ÓĎÄĹŇÖÉÔ ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÔŇĹÂĎ×ÁÎÉŃ: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr "========== ĐĹŇĹÍĹÝĹÎÉĘ\n"
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr "%5d ÉÓËĚŔŢĹÎ %s\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d ĐĹŇĹÍĹÝĹÎÉĹ %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "ÉÓËĚŔŢÁĹÔÓŃ ÍÎĎÇĎÂÉÂĚÉĎÔĹŢÎŮĘ ĐŐÔŘ %s%s\n"
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr "ÉÓËĚŔŢÁĹÔÓŃ %s %s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr "đĎÄÇĎÔĎ×ËÁ..."
@@ -2415,82 +2464,83 @@ msgstr "đĎÄÇĎÔĎ×ËÁ..."
msgid "Preparing packages for installation..."
msgstr "đĎÄÇĎÔĎ×ËÁ ĐÁËĹÔĎ× ÄĚŃ ŐÓÔÁÎĎ×ËÉ..."
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "úÁÇŇŐÖÁĹÔÓŃ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ÄĚŃ ĆÁĘĚÁ %s ÎĹĎÂČĎÄÉÍÁ ÂĎĚĹĹ ÎĎ×ÁŃ ×ĹŇÓÉŃ RPM\n"
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %s: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "őÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "ĎÔËÁÔÉÔŘ (+%d,-%d) ĐÁËĹÔŮ Ë %s"
@@ -2500,6 +2550,38 @@ msgstr "ĎÔËÁÔÉÔŘ (+%d,-%d) ĐÁËĹÔŮ Ë %s"
msgid "read failed: %s (%d)\n"
msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ: %s (%d)\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3037,8 +3119,8 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÉÎÄĹËÓ %s\n"
msgid "no dbpath has been set\n"
msgstr "ĐÁŇÁÍĹÔĹŇ dbpath ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "ĎŰÉÂËÁ(%d) ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓĹĘ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s\n"
@@ -3048,135 +3130,135 @@ msgstr "ĎŰÉÂËÁ(%d) ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓĹĘ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s\n"
msgid "error(%d) storing record #%d into %s\n"
msgstr "ĎŰÉÂËÁ(%d) ÚÁĐÉÓÉ ÚÁĐÉÓÉ %s × %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: ĐĎĚŐŢĹÎ ĐĎ×ŇĹÖÄĹÎÎŮĘ ÚÁÇĎĚĎ×ĎË #%u, ĐŇĎĐŐÓËÁĹÔÓŃ.\n"
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ÚÁÇĎĚĎ×ĎË × 0x%x\n"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "ĎŰÉÂËÁ(%d) ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓĹĘ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ ÉÚ ÉÎÄĹËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "ĎŰÉÂËÁ(%d) ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓĹĘ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "ĎŰÉÂËÁ(%d) ÚÁĐÉÓÉ ÚÁĐÉÓÉ %s × %s\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "ĎŰÉÂËÁ(%d) ŐÄÁĚĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ĎŰÉÂËÁ(%d) ŇĹÚĹŇ×ÉŇĎ×ÁÎÉŃ ĐÁÍŃÔÉ ÄĚŃ ĎÂŇÁÚÁ ÎĎ×ĎÇĎ ĐÁËĹÔÁ\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ \"%s\" × ÉÎÄĹËÓ %s.\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ × ÉÎÄĹËÓ %s\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "ĎŰÉÂËÁ(%d) ÚÁĐÉÓÉ ÚÁĐÉÓÉ %s × %s\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "ŐÄÁĚŃĹÔÓŃ %s ĐĎÓĚĹ ŐÓĐĹŰÎĎÇĎ ÚÁ×ĹŇŰĹÎÉŃ ĐĹŇĹÉÎÄĹËÁĂÉÉ ÂÁÚŮ × db3.\n"
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "ĐÁŇÁÍĹÔĹŇ dbpath ÎĹ ŐÓÔÁÎĎ×ĚĹÎ"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ĐĹŇĹÓÔŇÁÉ×ÁĹÔÓŃ ÂÁÚÁ ÄÁÎÎŮČ %s × %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr "×ŇĹÍĹÎÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ %s ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ\n"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÎĎ×ÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "ÚÁĐÉÓŘ ÎĎÍĹŇ %u × ÂÁÚĹ ÄÁÎÎŮČ ÎĹ×ĹŇÎÁ, ĐŇĎĐŐÓËÁĹÔÓŃ.\n"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ (ĐĹŇ×ĎÎÁŢÁĚŘÎĎ × %u)\n"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ĐĹŇĹÓÔŇĎĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ ÎĹ ŐÄÁĚĎÓŘ, ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ĎÓÔÁĹÔÓŃ ÎÁ ÍĹÓÔĹ\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁÍĹÎÉÔŘ ÓÔÁŇŐŔ ÂÁÚŐ ÄÁÎÎŮČ ÎÁ ÎĎ×ŐŔ!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ĆÁĘĚŮ × %s ÚÁÍĹÎŃŔÔÓŃ ĆÁĘĚÁÍÉ ÉÚ %s ÄĚŃ ×ĎÓÓÔÁÎĎ×ĚĹÎÉŃ"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr "ŐÄÁĚŃĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ËÁÔÁĚĎÇÁ %s: %s\n"
@@ -3388,6 +3470,73 @@ msgstr "url ĐĎŇÔ ÄĎĚÖĹÎ ÂŮÔŘ ŢÉÓĚĎÍ\n"
msgid "failed to create %s: %s\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: ĎŰÉÂËÁ ŢÔĹÎÉŃ ÓĐÉÓËÁ ĆÁĘĚĎ×: %s\n"
+
+#: tools/rpmgraph.c:286
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
+msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ×:"
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "ĎĐŇĹÄĹĚÉÔŘ ÍÁËŇĎÓ <ÉÍŃ> ÓĎ ÚÎÁŢĹÎÉĹÍ <ĐĎÄÓÔÁÎĎ×ËÁ>"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<ÉÍŃ> <ĐĎÄÓÔÁÎĎ×ËÁ>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<ÉÍŃ>+"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
@@ -3986,9 +4135,6 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "ŇĹÖÉÍ ĐŇĎ×ĹŇËÉ rpm (ÓÔÁŇŮĘ)"
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: ĎŰÉÂËÁ ŢÔĹÎÉŃ ÓĐÉÓËÁ ĆÁĘĚĎ×: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ %s/packages.rpm\n"
@@ -3998,27 +4144,6 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ GPG.\n"
-#~ msgid "========== relocations\n"
-#~ msgstr "========== ĐĹŇĹÍĹÝĹÎÉĘ\n"
-
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "%5d ÉÓËĚŔŢĹÎ %s\n"
-
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d ĐĹŇĹÍĹÝĹÎÉĹ %s -> %s\n"
-
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "ÉÓËĚŔŢÁĹÔÓŃ ÍÎĎÇĎÂÉÂĚÉĎÔĹŢÎŮĘ ĐŐÔŘ %s%s\n"
-
-#~ msgid "excluding %s %s\n"
-#~ msgstr "ÉÓËĚŔŢÁĹÔÓŃ %s %s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
-
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 09721c54f..a7bd1c080 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -74,273 +74,273 @@ 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:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "vypísať verziu používaného rpm"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "vypísať verziu používaného rpm"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "poslať štandardný výstup do <príkazu>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "použiť <adresár> ako adresár najvyššej úrovne"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
#, fuzzy
msgid "Signature options:"
msgstr "Veľkosť podpisu: %d\n"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "súbor %s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzia %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program 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"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "použitie: rpm {--help}"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Namiesto nich použite -e alebo --erase.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "môže byť použitý iba jeden hlavný režim"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "naraz môže byť vykonaný jeden typ otázky alebo overenia"
-#: rpmqv.c:691
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query flags"
msgstr "neočakávaný zdroj pre otázku"
-#: rpmqv.c:694
+#: rpmqv.c:692
#, fuzzy
msgid "unexpected query format"
msgstr "neočakávaný zdroj pre otázku"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "neočakávaný zdroj pre otázku"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath zadané pre operáciu nepoužívajúcu databázu"
-#: rpmqv.c:744
+#: rpmqv.c:742
#, 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é"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "súbory môžu byť presunuté iba počas inčtalácie balíka"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "može byť použitá iba jedna z volieb --prefix a --relocate"
-#: rpmqv.c:752
+#: rpmqv.c:750
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"
-#: rpmqv.c:755
+#: rpmqv.c:753
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"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "argumenty pre --prefix musia začínať znakom /"
-#: rpmqv.c:761
+#: rpmqv.c:759
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"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "môže byť použitá iba jedna voľba z --excludedocs a --includedocs"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches môže byť použité iba počas odstránenia balíkov"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles môže byť použité iba počas inštalácie balíka"
-#: rpmqv.c:812
+#: rpmqv.c:810
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"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options 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:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options 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:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -349,7 +349,7 @@ msgstr ""
"--nodeps môže byť použité iba počas inštalácie, odstránenia alebo overenia "
"balíka"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -357,7 +357,7 @@ msgstr ""
"--test môže byť použité iba počas inštalácie, odstránenia alebo zostavenia "
"balíka"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -365,82 +365,82 @@ 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"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty pre --root (-r) musia začínať znakom /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "nie je možné pracovať so súborom %s\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp nebolo nájdené: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Kontrola hesla zlyhala\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Heslo je v poriadku.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Chybná špecifikácia %%_signature v makro-súbore.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign môže byť použíté iba počas zostavenia balíka"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "neboli zadané žiadne balíky pre znovuzostavenie"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "neboli zadané žiadne spec-súbory pre zostavenie"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "neboli zadané žiadne tar-súbory pre zostavenie"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "neboli zadané žiadne balíky pre inštaláciu"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "neboli zadané žiadne balíky pre inštaláciu"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "neboli zadané žiadne argumenty pre otázku"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "neboli zadané žiadne argumenty pre overenie"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "neočakávané argumenty pre --querytags"
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "neboli zadané žiadne argumenty pre otázku"
@@ -1630,47 +1630,60 @@ msgstr "varovanie: %s vytvorené ako %s"
msgid "error creating temporary file %s\n"
msgstr "chyba pri vytváraní dočasného súboru %s"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:187
+#: lib/package.c:224
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným číslom <= 3"
-#: lib/package.c:195
+#: lib/package.c:232
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným číslom <= 3"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozícii\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "vynechané cesty musia začínať znakom /"
@@ -2085,7 +2098,7 @@ msgstr "zobraziť súbory v balíku"
msgid "don't verify files in package"
msgstr "zobraziť súbory v balíku"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "neoverovať závislosti balíka"
@@ -2253,8 +2266,8 @@ msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
msgid "can't query %s: %s\n"
msgstr "zmazanie %s zlyhalo: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
@@ -2268,7 +2281,7 @@ msgstr "otázka na %s zlyhala\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:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "žiadny z balíkov nespúšťa %s\n"
@@ -2338,7 +2351,7 @@ msgstr "požaduje sa záznam číslo %d\n"
msgid "record %u could not be read\n"
msgstr "záznam %d nie je možné prečítať\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nainštalovaný\n"
@@ -2464,6 +2477,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "OS je vynechaný: %s"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "presúva sa %s do %s\n"
+
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "vynecháva sa %s\n"
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "vynecháva sa %s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "presúva sa %s do %s\n"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "presúva sa %s do %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2473,82 +2520,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "neboli zadané žiadne balíky pre inštaláciu"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, 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:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní dočasného súboru %s"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je možné nainštalovať\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, 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:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "nevyriešené závislosti:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "inštalujú sa binárne balíky\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je možné otvoriť súbor %s: %s"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" špecifikuje viac balíkov\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je možné otvoriť %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Inštaluje sa %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2558,6 +2606,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "čítanie zlyhalo: %s (%d)"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3100,8 +3180,8 @@ msgstr "nie je možné otvoriť %s\n"
msgid "no dbpath has been set\n"
msgstr "nebola nastavená žiadna dbpath"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "chyba pri načítaní záznamu %s z %s"
@@ -3111,135 +3191,135 @@ msgstr "chyba pri načítaní záznamu %s z %s"
msgid "error(%d) storing record #%d into %s\n"
msgstr "chyba pri zápise záznamu %s do %s"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "nie je možné prečítať hlavičku na %d pre vyhľadanie"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "chyba pri načítaní záznamu %s z %s"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuje sa index skupín\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstraňuje sa index názvov\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "chyba pri načítaní záznamu %s z %s"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "chyba pri zápise záznamu %s do %s"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "chyba pri odstraňovaní záznamu %s z %s"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "chyba pri hľadaní balíka %s\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "chyba pri zápise záznamu %s do %s"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "nebola nastavená žiadna dbpath"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "znovu sa vytvára databáza v adresári %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "dočasná databáza %s už existuje"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otvára sa stará databáza\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otvára sa nová databáza\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "záznam číslo %d v databáze je chybný -- bol vynechaný"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie je možné pridať záznam pôvodne na %d"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "nepodarilo sa znovu vytvoriť databázu; zostáva pôvodná\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradiť starú databázu novou!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nepodarilo sa odstrániť adresár %s: %s\n"
@@ -3455,6 +3535,63 @@ msgstr "url port musí byť číslo\n"
msgid "failed to create %s: %s\n"
msgstr "nepodarilo sa vytvoriť %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "overiť podpis balíka"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "neoverovať závislosti balíka"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "overiť podpis balíka"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "vytvára sa adresár %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: readLead zlyhalo\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "odstránenie týchto balíkov by porušilo závislosti:\n"
@@ -4083,10 +4220,6 @@ msgstr "nepodarilo sa vytvoriť %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "režim otázok"
-#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: readLead zlyhalo\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "nie je možné otvoriť %s/packages.rpm\n"
@@ -4099,29 +4232,6 @@ msgstr "nepodarilo sa vytvoriť %s\n"
#~ msgstr "Vytvára sa PGP podpis: %d\n"
#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "OS je vynechaný: %s"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "presúva sa %s do %s\n"
-
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "vynecháva sa %s\n"
-
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "vynecháva sa %s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "presúva sa %s do %s\n"
-
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "presúva sa %s do %s\n"
-
-#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 788b7c788..1024de73e 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.268 2002/06/29 03:17:48 jbj Exp $
+# $Id: sl.po,v 1.269 2002/07/02 13:17:01 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -79,269 +79,269 @@ 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:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "različica rpm, ki jo uporabljate"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "definirajte makro <ime> z vrednostjo <telo>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "uporabljana različica rpm"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "standardni izhod preusmerjen na <ukaz>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za korenski imenik"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "prikaži končni rpmrc in nastavitev makra"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
#, fuzzy
msgid "Signature options:"
msgstr "Dolž. podpisa : %d\n"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "datoteka %s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM različica %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - Red Hat Software"
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Ta program je dovoljeno razpečevati pod pogoji navedenimi v GNU GPL."
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "Uporaba: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Namesto njiju uporabite -e ali --erase.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "izbran sme biti le en glavni način"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "samo en tip poizvedbe/preverjanja je možen naenkrat"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "nepričakovane zastavice pri poizvedbi"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "nepričakovana oblika poizvedbe"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "nepričakovan izvor poizvedbe"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath podan, vendar, čeprav nepotreben"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "izbiri --prefix in --relocate se medsebojno izključujeta"
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix se sme uporabiti le pri namestitvi"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti izbire --prefix se morajo začeti z /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "izbiri --excludedocs in --includedocs se medsebojno izključujeta"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sme podan le ob namestitvi paketa"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sme biti podati le ob namestitvi paketa"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -349,14 +349,14 @@ msgstr ""
"--nodeps sme biti podan le ob izgradnji, vnovični izgradnji, prevajanju, "
"namestitvi, odstranitvi ali preverjanju paketa"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -364,82 +364,82 @@ msgstr ""
"--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
"vnovični izgradnji paketa"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti izbire --root (-r) se morajo začeti z /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "ni datotek, ki bi jih lahko podpisal\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "dostop do datoteke %s ni možen\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp manjka: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Vnesite pristopno geslo: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Preverjanje pristopnega gesla neuspešno\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Pristopno geslo je pravo.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign sme biti podan le ob izgradnji paketa"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "izvajanje je bilo neuspešno\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "paketi za vnovično izgradnjo niso navedeni"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "nepričakovani argumenti za --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "argumenti za poizvedbo niso podani"
@@ -1633,47 +1633,60 @@ msgstr "opozorilo: %s ustvarjen kot %s"
msgid "error creating temporary file %s\n"
msgstr "napaka pri ustvarjanju začasne datoteke %s"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead je bil neuspešen\n"
-#: lib/package.c:187
+#: lib/package.c:224
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ta različica RPM podpira samo pakete z glavnim številom različice <= 3"
-#: lib/package.c:195
+#: lib/package.c:232
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ta različica RPM podpira samo pakete z glavnim številom različice <=4"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature je bil neuspešen\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead je bil neuspešen\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspešno: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "poti, ki niso obdelane, se morajo začeti z /"
@@ -2085,7 +2098,7 @@ msgstr "brez preverjanja datotek v paketu"
msgid "don't verify files in package"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "brez preverjanja soodvisnosti paketa"
@@ -2253,8 +2266,8 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
msgid "can't query %s: %s\n"
msgstr "ni možno poizvedeti o %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspešno: %s\n"
@@ -2268,7 +2281,7 @@ msgstr "poizvedba po %s je bila neuspešna\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:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "noben paket ne proži %s\n"
@@ -2338,7 +2351,7 @@ msgstr "številka zapisa paketa: %d\n"
msgid "record %u could not be read\n"
msgstr "zapisa %d ni možno prebrati\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni nameščen\n"
@@ -2466,6 +2479,40 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "OS je izključen: %s"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "premikanje %s v %s\n"
+
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "izključevanje datoteke %s%s\n"
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "izključevanje datoteke %s%s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "premikanje %s v %s\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "premiokanje imenika %s v %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2475,82 +2522,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "paketi za namestitev niso navedeni"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "Prenašanje %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskočeno - %s - prenos neuspešen - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni možno premakniti\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, 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:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni možno namestiti\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "neuspešne soodvisnosti:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "nameščanje binarnih paketov\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni možno odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" določa več paketov\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni možno odpreti %s: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Nameščanje %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2560,6 +2608,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "branje je bilo neuspešno: %s (%d)"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3105,8 +3185,8 @@ msgstr "ni možno odpreti kazala %s:"
msgid "no dbpath has been set\n"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
@@ -3116,137 +3196,137 @@ msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
msgid "error(%d) storing record #%d into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ni možno prebrati glave pri 0x%x"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstranjevanje %d vnosov iz kazala %s\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "napaka(%d) pri iskanju paketa %s\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "dodajanje \"%s\" v kazalo %s.\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "dodajanje %d vnosov v kazalo %s.\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "začasna podatkovna zbirka %s že obstaja"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "odpiranje stare podatkovne zbirke\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "zapis št. %d v zbirki je poškodovan -- preskočeno."
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "zapisa ni možno dodati na %d"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ponovna izgradnja podatkovne zbirke je bila neuspešna; stara ostaja na\n"
"istem mestu\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspešna!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "odstranjevanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspešna odstranitev imenika %s: %s\n"
@@ -3462,6 +3542,66 @@ msgstr "vrata URL morajo biti številka\n"
msgid "failed to create %s: %s\n"
msgstr "neuspešno ustvarjanje %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "preveri podpis paketa(-ov)"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "brez preverjanja soodvisnosti paketa"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "preveri podpis paketa(-ov)"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "ustvarjanje imenika: %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: branje Fread je bilo neuspešno: %s\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "definirajte makro <ime> z vrednostjo <telo>"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
@@ -4087,10 +4227,6 @@ msgstr "neuspešno ustvarjanje %s: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "poizvedbeni način (opuščen)"
-#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: branje Fread je bilo neuspešno: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "datoteke %s/packages.rpm ni možno odpreti\n"
@@ -4101,28 +4237,6 @@ msgstr "neuspešno ustvarjanje %s: %s\n"
#~ msgstr "Ustvarjanje podpisa z GnuPG.\n"
#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "OS je izključen: %s"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "premikanje %s v %s\n"
-
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "izključevanje datoteke %s%s\n"
-
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "izključevanje datoteke %s%s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "premikanje %s v %s\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "premiokanje imenika %s v %s\n"
-
-#, fuzzy
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 716f7630a..e1d10a20a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
@@ -71,271 +71,271 @@ msgstr "greška potrage za paketom %s\n"
msgid "cannot re-open payload: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "napiši verziju rpm-a koja se koristi"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
+#: rpmqv.c:123 lib/poptALL.c:141
#, fuzzy
-msgid "print macro expansion of <expr>+"
+msgid "print macro expansion of EXPR"
msgstr "napiši verziju rpm-a koja se koristi"
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "pošalji standardni izlaz u <komandu>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, fuzzy, c-format
msgid "%s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzija %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
#, fuzzy
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Možete slobodno distribuirati dalje pod odredbama GNU GPL"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, fuzzy, c-format
msgid "Usage: %s {--help}\n"
msgstr "korišćenje: {rpm --help}"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
#, fuzzy
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Koristite -e ili --erase.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "samo jedan glavni režim može biti naveden"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "samo jedan tip upita/provere može biti urađen odjednom"
-#: rpmqv.c:691
+#: rpmqv.c:689
#, fuzzy
msgid "unexpected query flags"
msgstr "neočekivan izvor upita"
-#: rpmqv.c:694
+#: rpmqv.c:692
#, fuzzy
msgid "unexpected query format"
msgstr "neočekivan izvor upita"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "neočekivan izvor upita"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
-#: rpmqv.c:744
+#: rpmqv.c:742
#, fuzzy
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr "samo instalacija i ažuriranje mogu biti forsirane"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "datoteke mogu biti premeštene samo tokom instalacije paketa"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "samo jedno možete koristiti: --prefix ili --relocate"
-#: rpmqv.c:752
+#: rpmqv.c:750
#, fuzzy
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr "--relocate možete koristiti samo kad instalirate novi paket"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix možete koristiti samo kod instalacije novog paketa"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "argumenti za --prefix moraju početi znakom /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludecocs možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includecocs možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "samo jedno možete da navedete: --excludedocs ili --includedocs"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:799
+#: rpmqv.c:797
#, fuzzy
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches možete koristiti samo kod brisanja paketa"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles možete koristiti samo kod instalacije paketa"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:817
+#: rpmqv.c:815
#, fuzzy
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:822
+#: rpmqv.c:820
#, fuzzy
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
-#: rpmqv.c:826
+#: rpmqv.c:824
#, fuzzy
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
@@ -343,14 +343,14 @@ msgid ""
msgstr ""
"--nodeps možete koristiti samo kod instalacije, uklanjanja ili provere paketa"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
"--test možete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -358,84 +358,84 @@ msgstr ""
"--root (-r) možete navesti samo kod instalacije, uklanjanja, upita ili "
"rekreiranja baze podataka"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti za --root (-r) moraju početi znakom /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, fuzzy, c-format
msgid "cannot access file %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmqv.c:896
+#: rpmqv.c:894
#, fuzzy
msgid "pgp not found: "
msgstr "Datoteka nije pronađena na serveru"
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Neuspela provera lozinke\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Lozinka je dobra.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign se može koristiti samo kod kreiranja paketa"
-#: rpmqv.c:936
+#: rpmqv.c:934
#, fuzzy
msgid "exec failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "nedosataje paket za rekreiranje"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "nedostaje specifikacije za kreiranje"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "nedostaju 'tar' datoteke za kreiranje"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "nedostaje paket za instalaciju"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "neočekivani argumenti za --querytags"
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "nedostaju argumenti za upit"
@@ -1618,47 +1618,60 @@ msgstr "Ne mogu da otvorim datoteku %s: "
msgid "error creating temporary file %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:187
+#: lib/package.c:224
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podržani u ovoj verziji RPM-a"
-#: lib/package.c:195
+#: lib/package.c:232
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podržani u ovoj verziji RPM-a"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
#, fuzzy
msgid "exclude paths must begin with a /"
@@ -2078,7 +2091,7 @@ msgstr "instaliraj paket"
msgid "don't verify files in package"
msgstr "instaliraj paket"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
@@ -2246,8 +2259,8 @@ msgstr "paket nema imena"
msgid "can't query %s: %s\n"
msgstr "greška: ne mogu da otvorim %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
@@ -2261,7 +2274,7 @@ msgstr "upit nad %s neuspeo\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:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "nijedan paket ne aktivira %s\n"
@@ -2331,7 +2344,7 @@ msgstr "pogrešan broj paketa: %s\n"
msgid "record %u could not be read\n"
msgstr "ne mogu da pročitam slog %d\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -2457,6 +2470,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s nije naveden u %s"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, fuzzy, c-format
+msgid "%5d exclude %s\n"
+msgstr "Pribavljam %s\n"
+
+#: lib/rpmfi.c:568
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "Ne mogu da otvorim datoteku %s: "
+
+#: lib/rpmfi.c:638
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "Pribavljam %s\n"
+
+#: lib/rpmfi.c:704
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "Pribavljam %s\n"
+
+#: lib/rpmfi.c:714
+#, fuzzy, c-format
+msgid "relocating %s to %s\n"
+msgstr "greška kod kreiranja direktorijuma %s: %s"
+
+#: lib/rpmfi.c:793
+#, fuzzy, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "greška kod kreiranja direktorijuma %s: %s"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2466,83 +2513,84 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "greška: %s se ne može instalirati\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadrži nijedan paket\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "loše međuzavisnosti:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" određuje više paketa\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "greška: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "neodstaje paket za deinstalaciju"
@@ -2552,6 +2600,38 @@ msgstr "neodstaje paket za deinstalaciju"
msgid "read failed: %s (%d)\n"
msgstr "neuspelo čitanje: %s (%d)"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3096,8 +3176,8 @@ msgstr "greška: ne mogu da otvorim %s\n"
msgid "no dbpath has been set\n"
msgstr "dbpath nije određen"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "greška kod uzimanja sloga %s iz %s"
@@ -3107,134 +3187,134 @@ msgstr "greška kod uzimanja sloga %s iz %s"
msgid "error(%d) storing record #%d into %s\n"
msgstr "greška zapisivanja sloga %s u %s"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "ne mogu da pročitam zaglavlje na %d za proveru"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "greška kod uzimanja sloga %s iz %s"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "greška kod uzimanja sloga %s iz %s"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "greška zapisivanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "greška kod potrage za paketom %s\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "greška zapisivanja sloga %s u %s"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "dbpath nije određen"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "privremena baza podataka %s već postoji"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, fuzzy, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "slog broj %d u bazi podataka je neispravan -- preskačem ga"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "ne mogu da dodam slog originalno na %d"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
@@ -3457,6 +3537,63 @@ msgstr "greška: FTP port mora biti broj\n"
msgid "failed to create %s: %s\n"
msgstr "neuspelo kreiranje %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "proveri potpis u paketu"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "nemoj proveravati zavisnosti paketa"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "proveri potpis u paketu"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "greška kod kreiranja direktorijuma %s: %s"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: Neuspeo 'readLead'\n"
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n"
@@ -3931,10 +4068,6 @@ msgstr "neuspelo kreiranje %s\n"
#~ msgstr "režim upita"
#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: Neuspeo 'readLead'\n"
-
-#, fuzzy
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
@@ -3947,26 +4080,6 @@ msgstr "neuspelo kreiranje %s\n"
#~ msgstr "napravi PGP potpis"
#, fuzzy
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "Pribavljam %s\n"
-
-#, fuzzy
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "Ne mogu da otvorim datoteku %s: "
-
-#, fuzzy
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "Pribavljam %s\n"
-
-#, fuzzy
-#~ msgid "excluding %s %s\n"
-#~ msgstr "Pribavljam %s\n"
-
-#, fuzzy
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "greška kod kreiranja direktorijuma %s: %s"
-
-#, fuzzy
#~ msgid "opening db file %s mode 0x%x\n"
#~ msgstr "rekreiraj bazu podataka iz postojeće baze"
diff --git a/po/sv.po b/po/sv.po
index bad8089f7..165f6643f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2002-02-18 21:13+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -74,252 +74,253 @@ 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:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "visa vilken version av rpm som används"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "visa mindre detaljerad utdata"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "visa mer detaljerad utdata"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "definiera makrot <namn> som <kropp>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<namn> <kropp>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "skriv ut makroexpansion av <uttr>+"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<uttr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "skicka standard ut till <kommando>"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<kommando>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<kat>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "läs <fil:...> istället för standardmakrofil(er)"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<fil:...>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "läs <fil:...> istället för standard rpmrc-fil(er)"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "visa slutliga rpmrc- och makrokonfigurationer"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "deaktivera användningen av libio(3)-API:et"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "felsök protokolldataström"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "felsök rpmio I/O"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "felsök cache-hanteringen av URL:ar"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr "Frĺgeflaggor (med -q eller --query):"
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr "Verifieringsflaggor (med -V eller --verify):"
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr "Signaturflaggor:"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr "Databasflaggor:"
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr "Byggflaggor med [ <specfil> | <tar-arkiv> | <källpaket> ]:"
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr "Installera-/Uppdatera-/Raderaflaggor"
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr "Gemensamma flaggor för alla rpm-lägen:"
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright Š 1998-2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Det här programmet kan distribueras fritt enligt villkoren i GNU GPL"
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Användning: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr "Flaggan --rcfile har tagits bort.\n"
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Använd \"--macros <fil:...>\" istället.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "Internt fel i argumenthantering (%d) :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "enbart ett huvudläge kan anges"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "endast en typ av frĺga/verifiering kan utföras ĺt gĺngen"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "oväntade frĺgeflaggor"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "oväntat frĺgeformat"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "oväntad frĺgekälla"
-#: rpmqv.c:738
+#: rpmqv.c:736
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:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr "filer kan relokeras endast under paketinstallation"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "enbart en av --prefix eller --relocate kan användas"
-#: rpmqv.c:752
+#: rpmqv.c:750
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"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix kan endast användas när nya paket installeras"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "argument till --prefix mĺste börja med /"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) kan enbart användas vid paketinstallation"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent kan enbart användas vid paketinstallation"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles kan enbart användas vid paketinstallation"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs kan enbart användas vid paketinstallation"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs kan enbart användas vid paketinstallation"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs kan enbart användas vid paketinstallation"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "enbart en av --excludedocs och --includedocs kan användas"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch kan enbart användas vid paketinstallation"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos kan enbart användas vid paketinstallation"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize kan enbart användas vid paketinstallation"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches kan enbart användas när paket raderas"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles kan enbart användas vid paketinstallation"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr "--justdb kan enbart användas när paket installeras eller raderas"
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -327,7 +328,7 @@ msgstr ""
"skriptdeaktiveringsflaggor kan enbart användas när paket installeras eller "
"raderas"
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -335,7 +336,7 @@ msgstr ""
"utlösardeaktiveringsflaggor kan enbart användas när paket installeras eller "
"raderas"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -343,13 +344,13 @@ msgstr ""
"--nodeps kan enbart användas när paket byggs, byggs om, kompileras om, "
"installeras, raderas eller verifieras"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr "--test kan enbart användas när paket installeras, raderas eller byggs"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -357,81 +358,81 @@ msgstr ""
"--root (-r) kan enbart användas när paket installeras, raderas, frĺgas eller "
"databasen byggs om"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "argument till --root (-r) mĺste börja med /"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "inga filer att signera\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "kan inte komma ĺt filen %s\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp hittades inte: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Ange lösenfras: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Kontrollen av lösenfrasen misslyckades\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Lösenfrasen är ok.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Felaktig %%_signature-spec i makrofil.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign kan enbart användas vid pakettillverkning"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna för omtillverkning"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "inga specfiler angivna för tillverkning"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "inga tar-filer angivna för tillverkning"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr "inga paket angivna att radera"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "inga parametrar angivna för frĺga"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "inga parametrar angivna för frĺga"
@@ -1595,45 +1596,59 @@ msgstr "%s skapades som %s\n"
msgid "error creating temporary file %s\n"
msgstr "fel när tämporärfil %s skapades\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n"
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature misslyckades\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgänglig\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "läs <fil:...> istället för standardmakrofil(er)"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "uteslutna sökvägar mĺste börja med /"
@@ -2016,7 +2031,7 @@ msgstr "verifiera inte rättigheter för filer"
msgid "don't verify files in package"
msgstr "verifiera inte filerna i paketet"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "verifiera inte paketberoenden"
@@ -2180,8 +2195,8 @@ msgstr "paketet har varken filägare eller id-listor\n"
msgid "can't query %s: %s\n"
msgstr "kan inte frĺga %s: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades med att öppna %s: %s\n"
@@ -2195,7 +2210,7 @@ msgstr "frĺga av %s misslyckades\n"
msgid "old format source packages cannot be queried\n"
msgstr "källpaket i gammalt format gĺr inte att frĺga om\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "inga paket matchar %s: %s\n"
@@ -2264,7 +2279,7 @@ msgstr "paketpost nummer: %u\n"
msgid "record %u could not be read\n"
msgstr "post %u kunde inte läsas\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
@@ -2391,6 +2406,40 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s har ouppfyllda Requires: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr "========== omflyttningar\n"
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr "%5d utesluter %s\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d flyttar om %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "hoppar över multilib-sökväg %s%s\n"
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr "hoppar över %s %s\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "flyttar %s till %s\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "flyttar katalogen %s till %s\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr "Förbereder..."
@@ -2399,82 +2448,83 @@ msgstr "Förbereder..."
msgid "Preparing packages for installation..."
msgstr "Förbereder paket för installation ..."
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, 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:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning frĺn fil %s\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, 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:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte öppna filen %s: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "ĺterställer (+%d,-%d) paket till %s"
@@ -2484,6 +2534,38 @@ msgstr "ĺterställer (+%d,-%d) paket till %s"
msgid "read failed: %s (%d)\n"
msgstr "läsning misslyckades: %s (%d)\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3018,8 +3100,8 @@ msgstr "kan inte öppna %s-indexet\n"
msgid "no dbpath has been set\n"
msgstr "ingen dbpath har satts\n"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "fel(%d) när \"%s\"-poster hämtades frĺn %s-indexet\n"
@@ -3029,134 +3111,134 @@ msgstr "fel(%d) när \"%s\"-poster hämtades frĺn %s-indexet\n"
msgid "error(%d) storing record #%d into %s\n"
msgstr "fel(%d) när post %s sparades i %s\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan inte läsa huvud vid 0x%x\n"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "fel(%d) när \"%s\"-poster hämtades frĺn %s-indexet\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "tar bort \"%s\" frĺn %s-indexet.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "tar bort %d poster frĺn %s-indexet.\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "fel(%d) när \"%s\"-poster hämtades frĺn %s-indexet\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "fel(%d) när post %s sparades i %s\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "fel(%d) när post %s togs bort ur %s\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fel(%d) vid allokering av ny paketinstans\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "lägger till \"%s\" till %s-indexet.\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "lägger till %d poster till %s-indexet.\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "fel(%d) när post %s sparades i %s\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "bygger om databas %s till %s\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr "tillfällig databas %s existerar redan\n"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr "skapar katalog %s\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr "skapar katalog %s: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "öppnar gammal databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "öppnar ny databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kan inte lägga till post ursprungligen vid %u\n"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte ersätta gammal databas med ny databas!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "byt ut filer i %s med filer frĺn %s för att ĺterställa"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr "tar bort katalog %s\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3368,6 +3450,73 @@ msgstr "url-port mĺste vara ett tal\n"
msgid "failed to create %s: %s\n"
msgstr "kunde inte skapa %s: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "verifiera paketsignatur"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "verifiera inte paketberoenden"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "verifiera paketsignatur"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "skapar katalog %s\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: läsning av paketlista misslyckades: %s\n"
+
+#: tools/rpmgraph.c:286
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
+msgstr "Gemensamma flaggor för alla rpm-lägen:"
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "definiera makrot <namn> som <kropp>"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<namn> <kropp>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<uttr>+"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
@@ -3959,9 +4108,6 @@ msgstr "kunde inte skapa %s: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "rpm verifieringsläge (ärvt)"
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: läsning av paketlista misslyckades: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "kan inte öppna %s/packages.rpm\n"
@@ -3971,27 +4117,6 @@ msgstr "kunde inte skapa %s: %s\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "Genererar signatur med GPG.\n"
-#~ msgid "========== relocations\n"
-#~ msgstr "========== omflyttningar\n"
-
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "%5d utesluter %s\n"
-
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d flyttar om %s -> %s\n"
-
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "hoppar över multilib-sökväg %s%s\n"
-
-#~ msgid "excluding %s %s\n"
-#~ msgstr "hoppar över %s %s\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "flyttar %s till %s\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "flyttar katalogen %s till %s\n"
-
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 1e41851d1..dbde91805 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-0400\n"
"PO-Revision-Date: 2001-07-05 08:02+300\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -75,256 +75,257 @@ msgstr "paketten baţlýk okunmasý sýrasýnda hata oluţtu\n"
msgid "cannot re-open payload: %s\n"
msgstr "payload %s tekrar açýlamýyor\n"
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr "Kullanýlan RPM sürümünü verir"
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr "daha az ayrýntýlý çýktý sađlar"
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr "daha ayrýntýlý çýktý sađlar"
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
-msgstr "<isim> makrosunu <gövde> deđeriyle tanýmlar"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
+msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
-msgstr "'<isim> <gövde>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
+msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+#, fuzzy
+msgid "print macro expansion of EXPR"
msgstr "<ifade>+ için makro açýlýmýný gösterir"
-#: rpmqv.c:123
-msgid "<expr>+"
-msgstr "<ifade>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
+msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr "standart çýktýyý <KOMUT>'a gönderir"
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr "<kmt>"
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr "<dizin>"
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur"
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr "<dosya:...>"
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr "öntanýmlý rpmrc dosyasý yerine <dosya:...> okunur"
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir"
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr "libio(3) API kullanýmýný iptal eder"
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr "protokol veri akýţýnda hata kontrolu"
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr "rpmio G/Ç hata kontrolu"
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr "URL arabellek kullanýmý hata kontrolu"
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr "Sorgulama seçenekleri (-q ya da --query ile)"
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr "Denetleme seçenekleri (-V ya da --verify ile)"
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr "Ýmza seçenekleri:"
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr "Veritabaný seçenekleri:"
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
"[ <specDosyasý> | <tarPaketi> | <kaynakPaketi> ] ile paketleme seçenekleri:"
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr "Kurma/Güncelleme/Kaldýrma seçenekleri:"
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr "Tüm rpm kipleri için ortak seçenekler:"
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr "dosya %s: %s\n"
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Sürüm %s\n"
-#: rpmqv.c:239
+#: rpmqv.c:237
#, fuzzy
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr "Copyright (C) 1998 - 2000 - Red Hat, Inc."
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr "Bu program GNU GPL koţullarýna uygun olarak serbestçe dađýtýlabilir."
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr "Kullanýmý: %s {--help}\n"
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr "--rcfile seçeneđi kaldýrýlmýţtý.\n"
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr "Yerine \"--macros <dosya:...>\" kullanýn.\n"
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr "(%d) argümaný iţlenirken iç hata oluţtu :-(\n"
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr "sadece bir ana kip belirtilebilir"
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr "bir anda sadece bir tarz sorgulama/denetleme yapýlabilir"
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr "beklenmeyen sorgulama bayraklarý"
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr "beklenmeyen sorgulama biçemi"
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr "beklenmeyen sorgulama kaynađý"
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr "--dbpath bir veritabaný kullanmayan iţlemler için verilmiţ"
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
"sadece kaynak ve spec silme iţlemleri, kurma, güncelleme iţlemleri için "
"zorlanabilir"
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
"dosyalar sadece paket kurulumu sýrasýnda yeni yerlerine yerleţtirilebilir"
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir"
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
"--relocate ve --excludepath sadece yeni paket kurulumunda kullanýlabilir"
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr "--prefix sadece yeni paketlerin kurulmasý sýrasýnda kullanýlabilir"
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr "--prefix ile belirtilenler '/' ile baţlamalý"
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr "--hash (-h) sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr "--percent sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr "--replacefiles sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr "--replacepkgs sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr "--excludedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr "--includedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr "--excludedocs ve --includedocs bir arada kullanýlamaz"
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr "--ignorearch sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr "--ignoreos sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr "--ignoresize sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr "--allmatches sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr "--allfiles sadece paket kurulumu sýrasýnda kullanýlabilir"
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
"--justdb sadece paket kurulumu ve kaldýrýlmasý sýrasýnda kullanýlabilir"
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
@@ -332,7 +333,7 @@ msgstr ""
"betik iptal etme seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
"kullanýlabilir"
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
@@ -340,7 +341,7 @@ msgstr ""
"tetikleme iptal seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
"kullanýlabilir"
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
@@ -348,7 +349,7 @@ msgstr ""
"--nodeps sadece paket oluţturma, yeniden oluţturma, yeniden derleme, "
"kurulum, kaldýrma ve denetleme iţlemlerinde kullanýlabilir"
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
@@ -356,7 +357,7 @@ msgstr ""
"--test sadece paket kurulumu, kaldýrýlmasý ve oluţturulmasý iţlemlerinde "
"kullanýlabilir"
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
@@ -364,82 +365,82 @@ msgstr ""
"--root (-r) sadece kurulum, kaldýrma, sorgulama ve yeniden veritabaný "
"oluţturma iţlemlerinde kullanýlabilir"
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ile verilenler '/' ile baţlamalý"
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr "imzalanacak dosya yok\n"
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr "%s dosyasý bulunamýyor\n"
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr "pgp bulunamadý: "
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr "Anahtar parolasýný girin: "
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr "Anahtar parolasý kontrolü baţarýsýz\n"
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr "Anahtar parolasý dođru.\n"
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr "Makro dosyasýndaki %%_signature spec geçersiz.\n"
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr "--sign sadece paket oluţturulurken kullanýlabilir"
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr "icra baţarýsýz\n"
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr "yeniden oluţturmak için paket dosyalarý belirtilmemiţ"
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr "oluţturma için gerekli spec dosyasý belirtilmemiţ"
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr "oluţturma için gereken tar dosyalarý belirtilmemiţ"
-#: rpmqv.c:1061
+#: rpmqv.c:1059
#, fuzzy
msgid "no packages given for erase"
msgstr "yüklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr "yüklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr "denetleme için hiç argüman belirtilmedi"
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr "--querytags ile beklenmeyen girdiler"
-#: rpmqv.c:1155
+#: rpmqv.c:1153
#, fuzzy
msgid "no arguments given"
msgstr "sorgulama için hiç argüman belirtilmedi"
@@ -1618,47 +1619,61 @@ msgstr "%s %s olarak oluţturuldu\n"
msgid "error creating temporary file %s\n"
msgstr "%s geçici dosyasý oluţturulurken hata\n"
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead baţarýsýz\n"
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n"
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler "
"destekleniyor\n"
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature baţarýsýz\n"
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ýmza bulundurmuyor\n"
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead baţarýsýz\n"
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread baţarýsýz: %s\n"
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+#, fuzzy
+msgid "read <FILE:...> instead of default file(s)"
+msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur"
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr "dýţlanan dosya yolu / ile baţlamalý"
@@ -2050,7 +2065,7 @@ msgstr "dosyalarýn kipleri dođrulanmaz"
msgid "don't verify files in package"
msgstr "paketteki dosyalar dođrulanamaz"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "paket bađýmlýlýklarý dođrulanmaz"
@@ -2213,8 +2228,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
msgid "can't query %s: %s\n"
msgstr "%s sorgulanamýyor: %s\n"
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s açýlamadý: %s\n"
@@ -2228,7 +2243,7 @@ msgstr "%s 'nin sorgulamasý baţarýsýzlýkla sonuçlandý\n"
msgid "old format source packages cannot be queried\n"
msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s tetikleyen paket yok\n"
@@ -2297,7 +2312,7 @@ msgstr "paket kayýt numarasý: %u\n"
msgid "record %u could not be read\n"
msgstr "%u. kayýt okunamadý\n"
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu deđil\n"
@@ -2424,6 +2439,40 @@ msgstr " %s A %s\tB %s\n"
msgid "package %s has unsatisfied %s: %s\n"
msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n"
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr "========== yeniden konumlama\n"
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr "%5d %s'i dýţlýyor\n"
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n"
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "multilib dosya yolu dýţlanýyor %s%s\n"
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr "%s %s dýţlanýyor\n"
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr "%s %s'e konumlanýyor\n"
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr "%s dizini %s de yeniden konumlanýyor\n"
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr "Hazýrlanýyor..."
@@ -2432,82 +2481,83 @@ msgstr "Hazýrlanýyor..."
msgid "Preparing packages for installation..."
msgstr "Kurulacak paketler hazýrlanýyor..."
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, 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:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr "... %s olarak\n"
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s atlanýyor - aktarým baţarýsýz - %s\n"
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s paketi yeniden konumlandýrýlamaz\n"
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasýndan okuma hatalý\n"
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n"
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yüklenemedi\n"
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "bađýmlýlýklarda hata; gerekli paketler:\n"
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr "icra edilebilir paketleri kuruluyor\n"
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyasý açýlamadý: %s\n"
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s açýlamadý: %s\n"
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2517,6 +2567,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr "okuma baţarýsýz: %s (%d)\n"
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -3049,8 +3131,8 @@ msgstr "%s indeksi açýlamadý\n"
msgid "no dbpath has been set\n"
msgstr "belirtilmiţ bir dbpath deđeri yok\n"
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
@@ -3060,136 +3142,136 @@ msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
msgid "error(%d) storing record #%d into %s\n"
msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr "rpmdb: bozuk baţlýk örneđi #%u alýndý, atlanýyor.\n"
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x de baţlýk okunamadý\n"
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "\"%s\" %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%d girdi %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n"
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "yeni paket örneđini tutma hatasý(%d)\n"
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "\"%s\" %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%d girdi %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "baţarýlý db3 yeniden oluţturma ertesinde %s kaldýrýlýyor\n"
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr "belirtilmiţ bir dbpath yok"
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%s veritabaný %s içinde yeniden oluţturuluyor\n"
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr "geçici veritabaný %s zaten mevcut\n"
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr "%s dizini oluţturuluyor\n"
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s dizini oluţturuluyor: %s\n"
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "eski veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "yeni veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n"
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kayýt özgün olarak %u e eklenemedi\n"
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"veritabaný yeniden oluţturulamadý: mevcut veritabaný deđiţmeden\n"
"yerinde býrakýldý\n"
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr "eski veritabanýnýn yenisiyle deđiţtirilirmesi baţarýsýz!\n"
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deđiţtiriliyor"
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr "%s dizini siliniyor\n"
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s dizininin silinmesi baţarýsýz: %s\n"
@@ -3401,6 +3483,73 @@ msgstr "url portu bir sayý olmalý\n"
msgid "failed to create %s: %s\n"
msgstr "%s oluţturulamadý: %s\n"
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+#, fuzzy
+msgid "don't verify header+payload signature"
+msgstr "paket imzasýný denetler"
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+#, fuzzy
+msgid "don't verify package digest"
+msgstr "paket bađýmlýlýklarý dođrulanmaz"
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+#, fuzzy
+msgid "don't verify package signature"
+msgstr "paket imzasýný denetler"
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+#, fuzzy
+msgid "don't change directories"
+msgstr "%s dizini oluţturuluyor\n"
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, fuzzy, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr "%s: bildirge okuma baţarýsýz: %s\n"
+
+#: tools/rpmgraph.c:286
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
+msgstr "Tüm rpm kipleri için ortak seçenekler:"
+
+#~ msgid "define macro <name> with value <body>"
+#~ msgstr "<isim> makrosunu <gövde> deđeriyle tanýmlar"
+
+#~ msgid "'<name> <body>'"
+#~ msgstr "'<isim> <gövde>'"
+
+#~ msgid "<expr>+"
+#~ msgstr "<ifade>+"
+
#~ msgid "removing these packages would break dependencies:\n"
#~ msgstr ""
#~ "bu paketin silinmesi aţađýdakilerin bađýmlýlýklarýný etkileyecektir:\n"
@@ -4006,10 +4155,6 @@ msgstr "%s oluţturulamadý: %s\n"
#~ msgid "rpm verify mode (legacy)"
#~ msgstr "rpm denetleme kipi (eski tip)"
-#, fuzzy
-#~ msgid "%s: read manifest failed: %s\n"
-#~ msgstr "%s: bildirge okuma baţarýsýz: %s\n"
-
#~ msgid "cannot open %s/packages.rpm\n"
#~ msgstr "%s/packages.rpm açýlamýyor\n"
@@ -4019,27 +4164,6 @@ msgstr "%s oluţturulamadý: %s\n"
#~ msgid "Generating signature using GPG.\n"
#~ msgstr "GPG kullanýlarak imza üretiliyor.\n"
-#~ msgid "========== relocations\n"
-#~ msgstr "========== yeniden konumlama\n"
-
-#~ msgid "%5d exclude %s\n"
-#~ msgstr "%5d %s'i dýţlýyor\n"
-
-#~ msgid "%5d relocate %s -> %s\n"
-#~ msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n"
-
-#~ msgid "excluding multilib path %s%s\n"
-#~ msgstr "multilib dosya yolu dýţlanýyor %s%s\n"
-
-#~ msgid "excluding %s %s\n"
-#~ msgstr "%s %s dýţlanýyor\n"
-
-#~ msgid "relocating %s to %s\n"
-#~ msgstr "%s %s'e konumlanýyor\n"
-
-#~ msgid "relocating directory %s to %s\n"
-#~ msgstr "%s dizini %s de yeniden konumlanýyor\n"
-
#~ msgid ""
#~ "package lacks both user name and id lists (this should never happen)\n"
#~ msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 9f349a5cb..36f658037 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 9f349a5cb..36f658037 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 9f349a5cb..36f658037 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 9f349a5cb..36f658037 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 23:17-0400\n"
+"POT-Creation-Date: 2002-07-01 13:41-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"
@@ -78,353 +78,353 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:112
+#: rpmqv.c:114 lib/poptALL.c:135
msgid "print the version of rpm being used"
msgstr ""
-#: rpmqv.c:115
+#: rpmqv.c:117 lib/poptALL.c:131
msgid "provide less detailed output"
msgstr ""
-#: rpmqv.c:117
+#: rpmqv.c:119 lib/poptALL.c:133
msgid "provide more detailed output"
msgstr ""
-#: rpmqv.c:119
-msgid "define macro <name> with value <body>"
+#: rpmqv.c:121 lib/poptALL.c:138
+msgid "define MACRO with value EXPR"
msgstr ""
-#: rpmqv.c:120
-msgid "'<name> <body>'"
+#: rpmqv.c:121 lib/poptALL.c:139
+msgid "'MACRO EXPR'"
msgstr ""
-#: rpmqv.c:122
-msgid "print macro expansion of <expr>+"
+#: rpmqv.c:123 lib/poptALL.c:141
+msgid "print macro expansion of EXPR"
msgstr ""
-#: rpmqv.c:123
-msgid "<expr>+"
+#: rpmqv.c:123 lib/poptALL.c:142
+msgid "'EXPR'"
msgstr ""
-#: rpmqv.c:125
+#: rpmqv.c:125 lib/poptALL.c:144
msgid "send stdout to <cmd>"
msgstr ""
-#: rpmqv.c:126
+#: rpmqv.c:125 lib/poptALL.c:145
msgid "<cmd>"
msgstr ""
-#: rpmqv.c:128
+#: rpmqv.c:127 lib/poptALL.c:147
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:129 lib/poptI.c:221
+#: rpmqv.c:127 lib/poptALL.c:148 lib/poptI.c:221
msgid "<dir>"
msgstr ""
-#: rpmqv.c:131
+#: rpmqv.c:129
msgid "read <file:...> instead of default macro file(s)"
msgstr ""
-#: rpmqv.c:132 rpmqv.c:136 rpmqv.c:140
+#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
msgid "<file:...>"
msgstr ""
-#: rpmqv.c:135 rpmqv.c:139
+#: rpmqv.c:133 rpmqv.c:137
msgid "read <file:...> instead of default rpmrc file(s)"
msgstr ""
-#: rpmqv.c:143
+#: rpmqv.c:141 lib/poptALL.c:162
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpmqv.c:148
+#: rpmqv.c:146 lib/poptALL.c:167
msgid "disable use of libio(3) API"
msgstr ""
-#: rpmqv.c:151
+#: rpmqv.c:149 lib/poptALL.c:171
msgid "debug protocol data stream"
msgstr ""
-#: rpmqv.c:153
+#: rpmqv.c:151 lib/poptALL.c:173
msgid "debug rpmio I/O"
msgstr ""
-#: rpmqv.c:155
+#: rpmqv.c:153 lib/poptALL.c:175
msgid "debug URL cache handling"
msgstr ""
-#: rpmqv.c:175
+#: rpmqv.c:173
msgid "Query options (with -q or --query):"
msgstr ""
-#: rpmqv.c:178
+#: rpmqv.c:176
msgid "Verify options (with -V or --verify):"
msgstr ""
-#: rpmqv.c:184
+#: rpmqv.c:182
msgid "Signature options:"
msgstr ""
-#: rpmqv.c:190
+#: rpmqv.c:188
msgid "Database options:"
msgstr ""
-#: rpmqv.c:196
+#: rpmqv.c:194
msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
msgstr ""
-#: rpmqv.c:202
+#: rpmqv.c:200
msgid "Install/Upgrade/Erase options:"
msgstr ""
-#: rpmqv.c:207
+#: rpmqv.c:205
msgid "Common options for all rpm modes:"
msgstr ""
#. @-modfilesys -globs @
-#: rpmqv.c:224 lib/poptI.c:28
+#: rpmqv.c:222 lib/poptI.c:28
#, c-format
msgid "%s: %s\n"
msgstr ""
-#: rpmqv.c:232
+#: rpmqv.c:230 lib/poptALL.c:47
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpmqv.c:239
+#: rpmqv.c:237
msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
msgstr ""
-#: rpmqv.c:240
+#: rpmqv.c:238
msgid "This program may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpmqv.c:252
+#: rpmqv.c:250
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:610
+#: rpmqv.c:608
msgid "The --rcfile option has been eliminated.\n"
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:609
msgid "Use \"--macros <file:...>\" instead.\n"
msgstr ""
-#: rpmqv.c:617
+#: rpmqv.c:615
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:656 rpmqv.c:662 rpmqv.c:668 rpmqv.c:706
msgid "only one major mode may be specified"
msgstr ""
-#: rpmqv.c:687
+#: rpmqv.c:685
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpmqv.c:691
+#: rpmqv.c:689
msgid "unexpected query flags"
msgstr ""
-#: rpmqv.c:694
+#: rpmqv.c:692
msgid "unexpected query format"
msgstr ""
-#: rpmqv.c:697
+#: rpmqv.c:695
msgid "unexpected query source"
msgstr ""
-#: rpmqv.c:738
+#: rpmqv.c:736
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:744
+#: rpmqv.c:742
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpmqv.c:746
+#: rpmqv.c:744
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpmqv.c:749
+#: rpmqv.c:747
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpmqv.c:752
+#: rpmqv.c:750
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:755
+#: rpmqv.c:753
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpmqv.c:758
+#: rpmqv.c:756
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpmqv.c:761
+#: rpmqv.c:759
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpmqv.c:765
+#: rpmqv.c:763
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpmqv.c:770
+#: rpmqv.c:768
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:774
+#: rpmqv.c:772
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:778
+#: rpmqv.c:776
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:782
+#: rpmqv.c:780
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpmqv.c:786
+#: rpmqv.c:784
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpmqv.c:790
+#: rpmqv.c:788
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpmqv.c:794
+#: rpmqv.c:792
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpmqv.c:799
+#: rpmqv.c:797
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpmqv.c:803
+#: rpmqv.c:801
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpmqv.c:807
+#: rpmqv.c:805
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpmqv.c:812
+#: rpmqv.c:810
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:817
+#: rpmqv.c:815
msgid ""
"script disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:822
+#: rpmqv.c:820
msgid ""
"trigger disabling options may only be specified during package installation "
"and erasure"
msgstr ""
-#: rpmqv.c:826
+#: rpmqv.c:824
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpmqv.c:831
+#: rpmqv.c:829
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpmqv.c:836
+#: rpmqv.c:834
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpmqv.c:848
+#: rpmqv.c:846
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpmqv.c:872
+#: rpmqv.c:870
msgid "no files to sign\n"
msgstr ""
-#: rpmqv.c:877
+#: rpmqv.c:875
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpmqv.c:896
+#: rpmqv.c:894
msgid "pgp not found: "
msgstr ""
-#: rpmqv.c:901
+#: rpmqv.c:899
msgid "Enter pass phrase: "
msgstr ""
-#: rpmqv.c:903
+#: rpmqv.c:901
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpmqv.c:907
+#: rpmqv.c:905
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpmqv.c:912
+#: rpmqv.c:910
#, c-format
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpmqv.c:919
+#: rpmqv.c:917
msgid "--sign may only be used during package building"
msgstr ""
-#: rpmqv.c:936
+#: rpmqv.c:934
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:967
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1035
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1037
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1059
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1100
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1116
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1129
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1137
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1153
msgid "no arguments given"
msgstr ""
@@ -1569,45 +1569,58 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
+#: lib/package.c:211 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:187
+#: lib/package.c:224
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:195
+#: lib/package.c:232
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
+#: lib/package.c:241 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
+#: lib/package.c:245 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:524
+#: lib/package.c:291 lib/rpmchecksig.c:524
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
+#: lib/package.c:326 lib/package.c:351 lib/package.c:381 lib/rpmchecksig.c:697
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
+#: lib/package.c:393 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
+#: lib/poptALL.c:150 lib/poptALL.c:154 lib/poptALL.c:158
+msgid "read <FILE:...> instead of default file(s)"
+msgstr ""
+
+#: lib/poptALL.c:151 lib/poptALL.c:155 lib/poptALL.c:159
+msgid "<FILE:...>"
+msgstr ""
+
+#: lib/poptALL.c:236
+#, c-format
+msgid "%s: option table misconfigured (%d)\n"
+msgstr ""
+
#: lib/poptI.c:51
msgid "exclude paths must begin with a /"
msgstr ""
@@ -1979,7 +1992,7 @@ msgstr ""
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:264 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
@@ -2136,8 +2149,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:497
-#: lib/rpminstall.c:885
+#: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:362 lib/rpminstall.c:493
+#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2151,7 +2164,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:679 lib/rpminstall.c:510
+#: lib/query.c:679 lib/rpminstall.c:506
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2220,7 +2233,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:977 lib/rpminstall.c:670
+#: lib/query.c:977 lib/rpminstall.c:660
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2343,6 +2356,40 @@ msgstr ""
msgid "package %s has unsatisfied %s: %s\n"
msgstr ""
+#: lib/rpmfi.c:561
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/rpmfi.c:565
+#, c-format
+msgid "%5d exclude %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:568
+#, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:638
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/rpmfi.c:704
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:714
+#, c-format
+msgid "relocating %s to %s\n"
+msgstr ""
+
+#: lib/rpmfi.c:793
+#, c-format
+msgid "relocating directory %s to %s\n"
+msgstr ""
+
#: lib/rpminstall.c:167
msgid "Preparing..."
msgstr ""
@@ -2351,81 +2398,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:313
+#: lib/rpminstall.c:309
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:322
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:326
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:421
+#: lib/rpminstall.c:417
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:467
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:477
+#: lib/rpminstall.c:473
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:489 lib/rpminstall.c:741
+#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:521
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:539 lib/rpminstall.c:698 lib/rpminstall.c:1072
+#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:546
+#: lib/rpminstall.c:542 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:576
+#: lib/rpminstall.c:572
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:597
+#: lib/rpminstall.c:593
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:673
+#: lib/rpminstall.c:663
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:728
+#: lib/rpminstall.c:718
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:734
+#: lib/rpminstall.c:724
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1066
+#: lib/rpminstall.c:1056
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2435,6 +2483,38 @@ msgstr ""
msgid "read failed: %s (%d)\n"
msgstr ""
+#: lib/rpmlibprov.c:30
+msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
+msgstr ""
+
+#: lib/rpmlibprov.c:33
+msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
+msgstr ""
+
+#: lib/rpmlibprov.c:36
+msgid "package payload is compressed using bzip2."
+msgstr ""
+
+#: lib/rpmlibprov.c:39
+msgid "package payload file(s) have \"./\" prefix."
+msgstr ""
+
+#: lib/rpmlibprov.c:42
+msgid "package name-version-release is not implicitly provided."
+msgstr ""
+
+#: lib/rpmlibprov.c:45
+msgid "header tags are always sorted after being loaded."
+msgstr ""
+
+#: lib/rpmlibprov.c:48
+msgid "the scriptlet interpreter can use arguments from header."
+msgstr ""
+
+#: lib/rpmlibprov.c:51
+msgid "a hardlink file set may be installed without being complete."
+msgstr ""
+
#. @observer@
#: lib/rpmps.c:200
msgid "different"
@@ -2962,8 +3042,8 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2048
-#: rpmdb/rpmdb.c:2153 rpmdb/rpmdb.c:2840
+#: rpmdb/rpmdb.c:995 rpmdb/rpmdb.c:1124 rpmdb/rpmdb.c:1173 rpmdb/rpmdb.c:2049
+#: rpmdb/rpmdb.c:2154 rpmdb/rpmdb.c:2841
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
@@ -2973,134 +3053,134 @@ msgstr ""
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:1971
+#: rpmdb/rpmdb.c:1972
#, c-format
msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2236
+#: rpmdb/rpmdb.c:2237
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2297
+#: rpmdb/rpmdb.c:2298
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2408
+#: rpmdb/rpmdb.c:2409
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2412
+#: rpmdb/rpmdb.c:2413
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2439
+#: rpmdb/rpmdb.c:2440
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2460
+#: rpmdb/rpmdb.c:2461
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2470
+#: rpmdb/rpmdb.c:2471
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2612
+#: rpmdb/rpmdb.c:2613
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2816
+#: rpmdb/rpmdb.c:2817
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2820
+#: rpmdb/rpmdb.c:2821
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2856
+#: rpmdb/rpmdb.c:2857
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3195
+#: rpmdb/rpmdb.c:3196
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:3231
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3257
+#: rpmdb/rpmdb.c:3258
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3261
+#: rpmdb/rpmdb.c:3262
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3267
+#: rpmdb/rpmdb.c:3268
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3269
+#: rpmdb/rpmdb.c:3270
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3276
+#: rpmdb/rpmdb.c:3277
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3287
+#: rpmdb/rpmdb.c:3288
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3311
+#: rpmdb/rpmdb.c:3312
#, c-format
msgid "record number %u in database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3351
+#: rpmdb/rpmdb.c:3352
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3369
+#: rpmdb/rpmdb.c:3370
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3377
+#: rpmdb/rpmdb.c:3378
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3379
+#: rpmdb/rpmdb.c:3380
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3389
+#: rpmdb/rpmdb.c:3390
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3391
+#: rpmdb/rpmdb.c:3392
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
@@ -3311,3 +3391,56 @@ msgstr ""
#, c-format
msgid "failed to create %s: %s\n"
msgstr ""
+
+#: tools/rpmcache.c:398 tools/rpmgraph.c:276
+msgid "don't verify header+payload signature"
+msgstr ""
+
+#: tools/rpmcache.c:400 tools/rpmgraph.c:278
+msgid "don't verify package digest"
+msgstr ""
+
+#: tools/rpmcache.c:402 tools/rpmgraph.c:280
+msgid "don't verify package signature"
+msgstr ""
+
+#: tools/rpmcache.c:405
+msgid "follow command line symlinks"
+msgstr ""
+
+#: tools/rpmcache.c:407
+msgid "logical walk"
+msgstr ""
+
+#: tools/rpmcache.c:409
+msgid "don't change directories"
+msgstr ""
+
+#: tools/rpmcache.c:411
+msgid "don't get stat info"
+msgstr ""
+
+#: tools/rpmcache.c:413
+msgid "physical walk"
+msgstr ""
+
+#: tools/rpmcache.c:415
+msgid "return dot and dot-dot"
+msgstr ""
+
+#: tools/rpmcache.c:417
+msgid "don't cross devices"
+msgstr ""
+
+#: tools/rpmcache.c:419
+msgid "return whiteout information"
+msgstr ""
+
+#: tools/rpmgraph.c:177
+#, c-format
+msgid "%s: read manifest failed: %s\n"
+msgstr ""
+
+#: tools/rpmgraph.c:286
+msgid "Common options for all rpm modes and executables:"
+msgstr ""
diff --git a/rpm.spec.in b/rpm.spec.in
index 94d501f09..9a172452e 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -77,7 +77,7 @@ will manipulate RPM packages and databases.
%package build
Summary: Scripts and executable programs used to build packages.
Group: Development/Tools
-Requires: rpm = %{rpm_version}, patch >= 2.5
+Requires: rpm = %{rpm_version}, patch >= 2.5, file
Provides: rpmbuild(VendorConfig) = %{version}
%description build
@@ -434,8 +434,8 @@ fi
#%attr(0644, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/perl.req
%rpmattr %{__prefix}/lib/rpm/rpm[bt]
-%rpmattr %{__prefix}/lib/rpm/rpmdiff
-%rpmattr %{__prefix}/lib/rpm/rpmdiff.cgi
+#%rpmattr %{__prefix}/lib/rpm/rpmdiff
+#%rpmattr %{__prefix}/lib/rpm/rpmdiff.cgi
%rpmattr %{__prefix}/lib/rpm/trpm
%rpmattr %{__prefix}/lib/rpm/u_pkg.sh
%rpmattr %{__prefix}/lib/rpm/vpkg-provides.sh
diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c
index b859e69cc..213b7d460 100644
--- a/rpmdb/legacy.c
+++ b/rpmdb/legacy.c
@@ -37,15 +37,12 @@
* @return -1 on error, otherwise, an open file descriptor
*/
static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_t *fsizep)
- /*@globals rpmGlobalMacroContext,
- fileSystem, internalState @*/
- /*@modifies *pidp, *fsizep, rpmGlobalMacroContext,
- fileSystem, internalState @*/
+ /*@globals rpmGlobalMacroContext, internalState @*/
+ /*@modifies *pidp, *fsizep, rpmGlobalMacroContext, internalState @*/
{
/*@only@*/
static const char * cmd = NULL;
static int initted = 0;
- pid_t pid;
int fdno;
if (!initted) {
@@ -112,6 +109,7 @@ static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_
/*@-boundswrite@*/
if (pidp != NULL && bingo) {
int pipes[2];
+ pid_t pid;
int xx;
xx = close(fdno);
diff --git a/rpmqv.c b/rpmqv.c
index a9a1e3de7..920ae0b12 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -461,6 +461,7 @@ int main(int argc, const char ** argv)
#endif
#ifdef IAM_RPMEIU
+ if (ia->relocations != NULL)
for (i = 0; i < ia->numRelocations; i++)
ia->relocations[i].oldPath = _free(ia->relocations[i].oldPath);
ia->relocations = _free(ia->relocations);
@@ -1220,6 +1221,7 @@ exit:
#endif
#ifdef IAM_RPMEIU
+ if (ia->relocations != NULL)
for (i = 0; i < ia->numRelocations; i++)
ia->relocations[i].oldPath = _free(ia->relocations[i].oldPath);
ia->relocations = _free(ia->relocations);
diff --git a/system.h b/system.h
index a313e0d32..03655c7e9 100644
--- a/system.h
+++ b/system.h
@@ -351,6 +351,7 @@ extern void muntrace (void)
else __progname = pn; \
}
#endif
+/*@unchecked@*/
const char *__progname;
#if HAVE_NETDB_H
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index 954d0c624..a5b973f2a 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -6,14 +6,15 @@
#include "rpmps.h"
#include "rpmte.h"
+
+#define _RPMTS_INTERNAL /* ts->goal, ts->dbmode, ts->suggests */
#include "rpmts.h"
#include "manifest.h"
-#ifdef DYING
-#include "misc.h"
-#endif
+#include "misc.h" /* rpmGlob */
#include "debug.h"
+static int noDeps = 1;
static int noChainsaw = 0;
static int vsflags = _RPMTS_VSF_VERIFY_LEGACY;
@@ -43,6 +44,7 @@ static int
rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv)
/*@*/
{
+ rpmps ps;
const char ** pkgURL = NULL;
char * pkgState = NULL;
const char ** fnp;
@@ -187,7 +189,41 @@ restart:
break;
}
- if (numFailed) goto exit;
+ if (numFailed > 0) goto exit;
+
+ if (!noDeps) {
+ rc = rpmtsCheck(ts);
+ if (rc) {
+ numFailed += numPkgs;
+ goto exit;
+ }
+ ps = rpmtsProblems(ts);
+ if (rpmpsNumProblems(ps) > 0) {
+ rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n"));
+ rpmpsPrint(NULL, ps);
+ numFailed += numPkgs;
+
+ /*@-branchstate@*/
+ if (ts->suggests != NULL && ts->nsuggests > 0) {
+ rpmMessage(RPMMESS_NORMAL, _(" Suggested resolutions:\n"));
+ for (i = 0; i < ts->nsuggests; i++) {
+ const char * str = ts->suggests[i];
+
+ if (str == NULL)
+ break;
+
+ rpmMessage(RPMMESS_NORMAL, "\t%s\n", str);
+ ts->suggests[i] = NULL;
+ str = _free(str);
+ }
+ ts->suggests = _free(ts->suggests);
+ }
+ /*@=branchstate@*/
+ }
+ ps = rpmpsFree(ps);
+ }
+
+ if (numFailed > 0) goto exit;
rc = rpmtsOrder(ts);
if (rc)
@@ -234,6 +270,8 @@ exit:
}
static struct poptOption optionsTable[] = {
+ { "check", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noDeps, 0,
+ N_("don't verify package dependencies"), NULL },
{ "nolegacy", '\0', POPT_BIT_CLR, &vsflags, _RPMTS_VSF_VERIFY_LEGACY,
N_("don't verify header+payload signature"), NULL },
{ "nodigest", '\0', POPT_BIT_SET, &vsflags, _RPMTS_VSF_NODIGESTS,
diff --git a/zlib/.cvsignore b/zlib/.cvsignore
index d82285b88..9eed9011f 100644
--- a/zlib/.cvsignore
+++ b/zlib/.cvsignore
@@ -20,6 +20,7 @@ doxygen
example
install-sh
libtool
+ltmain.sh
minigzip
missing
mkinstalldirs