Merge from rpm-4.0.4.

- trap SIGILL for ppc64 inline asm voodoo fix from cross-dressed ppc32.
- fix: fancy hash fiddles if not a tty.
- fix: handle /.../ correctly in rpmCleanPath().

CVS patchset: 5274
CVS date: 2002/01/27 16:49:06

diff --git a/CHANGES b/CHANGES
index 60857dc..4ba70d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -105,6 +105,10 @@
        - fix: query format qualifiers needed header.c merge.
        - ppc64 arch added (#58634,#58636).
        - turn on auto-generated perl requirements (#58519, #58536, #58537).
+       - fix: %exclude functional (again).
+       - trap SIGILL for ppc64 inline asm voodoo fix from cross-dressed ppc32.
+       - fix: fancy hash fiddles if not a tty.
+       - fix: handle /.../ correctly in rpmCleanPath().
 
 4.0.2 -> 4.0.3:
        - update per-interpreter dependency scripts, add sql/tcl (#20295).

diff --git a/autogen.sh b/autogen.sh
index cf68382..8dc5cb2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,6 +21,7 @@ recent versions of libtool/autoconf/automake.
 [ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1
 
 (cd popt; ./autogen.sh --noconfigure "$@")
+(cd zlib; ./autogen.sh --noconfigure "$@")
 libtoolize --copy --force
 aclocal
 autoheader

diff --git a/build/files.c b/build/files.c
index 17267ae..433f3bb 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1037,22 +1037,14 @@ static int isDoc(FileList fl, const char * fileName)    /*@*/
 static int checkHardLinks(FileList fl)
        /*@*/
 {
-    char nlangs[BUFSIZ];
     FileListRec ilp, jlp;
     int i, j;
 
-    nlangs[0] = '\0';
     for (i = 0;  i < fl->fileListRecsUsed; i++) {
-       char *te;
-
        ilp = fl->fileList + i;
        if (!(S_ISREG(ilp->fl_mode) && ilp->fl_nlink > 1))
            continue;
-       if (ilp->flags & RPMFILE_SPECFILE)
-           continue;
 
-       te = nlangs;
-       *te = '\0';
        for (j = i + 1; j < fl->fileListRecsUsed; j++) {
            jlp = fl->fileList + j;
            if (!S_ISREG(jlp->fl_mode))
@@ -1109,12 +1101,14 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
            !strcmp(flp->fileURL, flp[1].fileURL)) {
 
            /* Two entries for the same file found, merge the entries. */
-
-           rpmMessage(RPMMESS_WARNING, _("File listed twice: %s\n"),
-               flp->fileURL);
+           /* Note that an %exclude is a duplication of a file reference */
 
            /* file flags */
            flp[1].flags |= flp->flags; 
+
+           if (!(flp[1].flags & RPMFILE_EXCLUDE))
+               rpmMessage(RPMMESS_WARNING, _("File listed twice: %s\n"),
+                       flp->fileURL);
    
            /* file mode */
            if (S_ISDIR(flp->fl_mode)) {
@@ -1354,12 +1348,22 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
                !strcmp(flp->fileURL, flp[1].fileURL))
            flp++;
 
+       if (flp->flags & RPMFILE_EXCLUDE) {
+           i--;
+           continue;
+       }
+
        /* Create disk directory and base name. */
        fi->dil[i] = i;
        /*@-dependenttrans@*/ /* FIX: artifact of spoofing headerGetEntry */
        fi->dnl[fi->dil[i]] = d;
        /*@=dependenttrans@*/
+#ifdef IA64_SUCKS_ROCKS
+       (void) stpcpy(d, flp->diskURL);
+       d += strlen(d);
+#else
        d = stpcpy(d, flp->diskURL);
+#endif
 
        /* Make room for the dirName NUL, find start of baseName. */
        for (b = d; b > fi->dnl[fi->dil[i]] && *b != '/'; b--)
@@ -1373,8 +1377,20 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
        /*@-dependenttrans@*/   /* FIX: xstrdup? nah ... */
        fi->apath[i] = a;
        /*@=dependenttrans@*/
-       if (_addDotSlash) a = stpcpy(a, "./");
+       if (_addDotSlash) {
+#ifdef IA64_SUCKS_ROCKS
+           (void) stpcpy(a, "./");
+           a += strlen(a);
+#else
+           a = stpcpy(a, "./");
+#endif
+       }
+#ifdef IA64_SUCKS_ROCKS
+       (void) stpcpy(a, (flp->fileURL + skipLen));
+       a += strlen(a);
+#else
        a = stpcpy(a, (flp->fileURL + skipLen));
+#endif
        a++;            /* skip apath NUL */
 
        if (flp->flags & RPMFILE_GHOST) {
@@ -1551,8 +1567,10 @@ static int addFile(FileList fl, const char * diskURL, struct stat * statp)
        fileGname = getGname(getgid());
 #endif
     
-    rpmMessage(RPMMESS_DEBUG, _("File %4d: %07o %s.%s\t %s\n"), fl->fileCount,
+#ifdef DYING   /* XXX duplicates with %exclude, use psm.c output instead. */
+    rpmMessage(RPMMESS_DEBUG, _("File%5d: %07o %s.%s\t %s\n"), fl->fileCount,
        (unsigned)fileMode, fileUname, fileGname, fileURL);
+#endif
 
     /* Add to the file list */
     if (fl->fileListRecsUsed == fl->fileListRecsAlloced) {

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 7785472..312397e 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -48,7 +48,7 @@ static void printHash(const unsigned long amount, const unsigned long total)
                int i;
                for (i = 0; i < hashesPrinted; i++) (void) putchar ('#');
                for (; i < hashesTotal; i++) (void) putchar (' ');
-               printf ("(%3d%%)",
+               fprintf(stdout, "(%3d%%)",
                        (int)(100 * (total ? (((float) amount) / total) : 1)));
                for (i = 0; i < (hashesTotal + 6); i++) (void) putchar ('\b');
            } else
@@ -62,9 +62,12 @@ static void printHash(const unsigned long amount, const unsigned long total)
        if (hashesPrinted == hashesTotal) {
            int i;
            progressCurrent++;
-           for (i = 1; i < hashesPrinted; i++) (void) putchar ('#');
-           printf (" [%3d%%]\n", (int)(100 * (progressTotal ?
+           if (isatty(STDOUT_FILENO)) {
+               for (i = 1; i < hashesPrinted; i++) (void) putchar ('#');
+               fprintf(stdout, " [%3d%%]", (int)(100 * (progressTotal ?
                        (((float) progressCurrent) / progressTotal) : 1)));
+           }
+           fprintf(stdout, "\n");
        }
        (void) fflush(stdout);
     }
@@ -123,6 +126,8 @@ void * rpmShowProgress(/*@null@*/ const void * arg,
                                rpmTagTable, rpmHeaderFormats, NULL);
            if (isatty (STDOUT_FILENO))
                fprintf(stdout, "%4d:%-23.23s", progressCurrent + 1, s);
+           else
+               fprintf(stdout, "%-28.28s", s);
            (void) fflush(stdout);
            s = _free(s);
        } else {
@@ -154,7 +159,7 @@ void * rpmShowProgress(/*@null@*/ const void * arg,
        if (flags & INSTALL_HASH)
            fprintf(stdout, "%-28s", _("Preparing..."));
        else
-           printf("%s\n", _("Preparing packages for installation..."));
+           fprintf(stdout, "%s\n", _("Preparing packages for installation..."));
        (void) fflush(stdout);
        break;
 

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 8081990..7a5aa0e 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -2,6 +2,9 @@
 #include "system.h"
 
 #include <stdarg.h>
+#if defined(__linux__) && defined(__powerpc__)
+#include <setjmp.h>
+#endif
 
 #if HAVE_SYS_SYSTEMCFG_H
 #include <sys/systemcfg.h>
@@ -920,6 +923,15 @@ static int is_athlon(void)
 
 #endif
 
+#if defined(__linux__) && defined(__powerpc__)
+static jmp_buf mfspr_jmpbuf;
+
+static void mfspr_ill(int notused)
+{
+    longjmp(mfspr_jmpbuf, -1);
+}
+#endif
+
 static void defaultMachine(/*@out@*/ const char ** arch,
                /*@out@*/ const char ** os)
        /*@globals fileSystem@*/
@@ -1133,16 +1145,22 @@ static void defaultMachine(/*@out@*/ const char ** arch,
 
 #      if defined(__linux__) && defined(__powerpc__)
        {
-           unsigned pvr;
-           __asm__ __volatile__ ("mfspr %0, 287" : "=r" (pvr));
-
-           pvr >>= 16;
-           if ( pvr >= 0x40)
-               strcpy(un.machine, "ppcpseries");
-           else if ( (pvr == 0x36) || (pvr == 0x37) )
-               strcpy(un.machine, "ppciseries");
-           else
-               strcpy(un.machine, "ppc");
+           unsigned pvr = 0;
+           __sighandler_t oldh = signal(SIGILL, mfspr_ill);
+           if (setjmp(mfspr_jmpbuf) == 0) {
+               __asm__ __volatile__ ("mfspr %0, 287" : "=r" (pvr));
+           }
+           signal(SIGILL, oldh);
+
+           if ( pvr ) {
+               pvr >>= 16;
+               if ( pvr >= 0x40)
+                   strcpy(un.machine, "ppcpseries");
+               else if ( (pvr == 0x36) || (pvr == 0x37) )
+                   strcpy(un.machine, "ppciseries");
+               else
+                   strcpy(un.machine, "ppc");
+           }
        }
 #      endif
 

diff --git a/po/cs.po b/po/cs.po
index 7840694..54e86df 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -596,99 +596,98 @@ msgstr "Soubor mus
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nelze míchat speciální %%doc s ostatnímí formami: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Soubor uveden dvakrát: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolická linka ukazuje na BuildRoot: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Soubor nesouhlasí s prefixem (%s): %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Soubor nenalezen: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "©patný vlastník/skupina: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Soubor %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Soubor potøebuje úvodní \"/\": %s\n"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob není dovolen: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Soubor nenalezen globem: %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nemohu otevøít %%files soubor %s: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "øádek: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "©patný soubor: %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nemohu provést fork %s: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s selhalo\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "Nemohu zapsat v¹echna data do %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Hledám   %s: (pou¾it %s)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Selhalo vyhledání %s:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Zpracovávám soubory: %s-%s-%s\n"
@@ -2252,8 +2251,8 @@ msgstr "bal
 msgid "can't query %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otevøení %s selhalo: %s\n"
@@ -2267,7 +2266,7 @@ msgstr "dotaz na %s se nezda
 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:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2326,7 +2325,7 @@ msgstr "z
 msgid "record %u could not be read\n"
 msgstr "záznam %d nelze pøeèíst\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíèek %s není nainstalován\n"
@@ -2425,84 +2424,84 @@ 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/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "Pøipravuji..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "Pøipravuji balíèky pro instalaci..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Stahuji %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... jako %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "pøeskakuji %s - pøenos selhal - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balíèek %s není pøemístitelný\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pøi ètení ze souboru %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n"
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nemù¾e být nainstalován\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "nalezeno %d zdrojových a %d binárních balíèkù\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "nevyøe¹ené závislosti:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "instaluji binární balíèky\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nemohu otevøít soubor %s: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" urèuje více balíèkù\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaluji %s\n"
@@ -2512,97 +2511,97 @@ msgstr "Instaluji %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "ètení selhalo: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "chybí druhá ':' u %s:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "chybí název architektury u %s:%d\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Neúplný datový øádek %s:%d\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Pøíli¹ mnoho parametrù v datovém øádku %s:%d\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Chybné èíslo architektury nebo OS: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Neúplný standardní øádek %s:%d\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Pøíli¹ mnoho parametrù ve výchozím øádku u %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Nemohu èíst %s: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "chybí ':' (nalezeno na 0x%02x) v %s:%d\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "chybí parametr pro %s u %s:%d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "expanze %s selhala na %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nemohu otevøít soubor %s na %s:%d: %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "chybí architektura pro %s u %s:%d\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "chybná volba '%s' u %s:%d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámý systém: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Zkontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Nemohu expandovat %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Nemohu èíst %s, HOME je pøíli¹ velký.\n"
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nemohu otevøít %s pro ètení: %s.\n"

diff --git a/po/da.po b/po/da.po
index 7d0c94d..ee9ecce 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -591,99 +591,98 @@ msgstr "Fil skal begynde med \"/\": %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande special-%%doc med andre former: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil angivet to gange: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolsk lænke peger på BuildRoot: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Fil passer ikke til præfiks (%s): %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke fundet: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig ejer/gruppe: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Fil %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Fil kræver foranstillet \"/\": %s\n"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linie %d: Filnavn ikke tilladt: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fil ikke fundet med glob: %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "linie: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil: %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke udføre %s: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislykkedes\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "kunne ikke skrive alle data til %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Finder %s: (benytter %s)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Kunne ikke finde %s:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Gennemløber filer: %s-%s-%s\n"
@@ -2272,8 +2271,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:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "åbning af %s mislykkedes %s\n"
@@ -2287,7 +2286,7 @@ msgstr "foresp
 msgid "old format source packages cannot be queried\n"
 msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: læs manifest mislykkedes: %s\n"
@@ -2346,7 +2345,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:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
@@ -2445,84 +2444,84 @@ 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/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker til installation..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Modtager %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "overspringer %s - overførsel mislykkedes - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke omrokeres\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fejl ved læsning fra filen %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, 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:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kunne ikke installeres\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fandt %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "afhængighedskrav, der ikke kunne imødekommes:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "installerer binærpakker\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kunne ikke åbne fil %s: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" angiver flere pakker\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kunne ikke åbne %s: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
@@ -2532,99 +2531,99 @@ msgstr "Installerer %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "læsning mislykkedes: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "manglende andet ':' ved %s:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manglende navn på arkitektur ved %s:%d\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ufærdig datalinie ved %s:%d\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "For mange parametre på datalinie ved %s:%d\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Ugyldigt arch/os-tal: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ufuldstændig standardlinie ved %s:%d\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "For mange parametre i standardlinie ved %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Kunne ikke læse %s: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "manglende  ':' (fandt 0x%02x) ved %s:%d\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manglende parameter til %s ved %s:%d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s-udvidelse mislykkedes ved %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan ikke åbne %s ved %s:%d: %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manglende arkitektur for %s ved %s:%d\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ugyldig tilvalg '%s' ved %s:%d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 "Ukendt system: %s\n"
 "\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontakt venligst rpm-list@redhat.com (på engelsk)\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan ikke udfolde %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Kunne ikke læse %s, HOME er for stor.\n"
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke åbne %s for læsning: %s.\n"

diff --git a/po/de.po b/po/de.po
index 21374e2..9857930 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -669,106 +669,105 @@ msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
 # , c-format
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1554
+#: build/files.c:1571
 #, fuzzy, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
 # , c-format
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Konnte pgp nicht durchführen"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "pgp fehlgeschlagen"
 
 # , c-format
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/files.c:2608
+#: build/files.c:2626
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -2444,8 +2443,8 @@ msgstr "Paket hat keinen Namen"
 msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
@@ -2459,7 +2458,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:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2521,7 +2520,7 @@ msgstr "ung
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
@@ -2621,88 +2620,88 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
 # , c-format
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "Fehler: %s kann nicht installiert werden\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "Paket installieren"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
 # oder besser: "... verletzen" ?
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
@@ -2712,100 +2711,100 @@ msgstr "Installiere %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "fehlendes zweites ':' bei %s:%d"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "fehlender Name cer Architektur bei %s:%d"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Unvollständige Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Zu viele Argumente in der Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Unzureichende arch/os Zahl: %s (%s:%d)"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Unvollständige Standardzeile bei %s:%d"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Zu viele Argumente in der Standardzeile bei %s:%d"
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "fehlender ':' bei %s:%d"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "fehlendes Argument für %s bei %s:%d"
 
 # , c-format
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "fehlende Architektur für %s bei %s:%d"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "unzureichende Option '%s' bei %s:%d"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."

diff --git a/po/en_RN.po b/po/en_RN.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/es.po b/po/es.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/eu_ES.po b/po/eu_ES.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index d39b0e2..545670b 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -609,99 +609,98 @@ msgstr "siirtojen pit
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, fuzzy, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "pgp epäonnistui"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "en voinut avata %s: %s"
@@ -2321,8 +2320,8 @@ msgstr "paketilla ei ole nime
 msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
@@ -2336,7 +2335,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:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -2396,7 +2395,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:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
@@ -2495,86 +2494,86 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "asennukselle ei määritelty paketteja"
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Haen: %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "virhe: %s ei voida asentaa\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "puuttuvat riippuvuudet:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "asenna paketti"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" määrittää useita paketteja\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
@@ -2584,97 +2583,97 @@ msgstr "Asennan: %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "luku epäonnistui: %s (%d)"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "toinen ':' puuttuu, %s:%d"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "puuttuva arkkitehtuurin nimi, %s:%d"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Epätäydellinen datarivi, %s:%d"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "liian monta parametriä datarivillä %s:%d"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Huono arkkitehtuuri/käyttöjärjestelmä numero: %s (%s:%d)"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Epätäydellinen oletusrivi, %s:%d"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "liian monta parametriä oletusrivillä %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "En voi lukea %s: %s."
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "puuttuva ':', %s:%d"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s:n puuttuva parametri %s:%d"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s:n puuttuva arkkitehtuuri %s:%d"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "huono parametri '%s', %s:%d"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "En voi avata %s luettavaksi: %s."

diff --git a/po/fr.po b/po/fr.po
index bc331dd..c2a4cea 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -635,99 +635,98 @@ msgstr "les arguments de --root (-r) doivent commencer par un /"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
-msgstr ""
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
+msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "La construction a chou.\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2354,8 +2353,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:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a chou.\n"
@@ -2369,7 +2368,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2429,7 +2428,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2526,85 +2525,85 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2614,97 +2613,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "impossible d'ouvrir: %s\n"

diff --git a/po/gl.po b/po/gl.po
index 3a68f97..5fbac64 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -580,99 +580,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2199,8 +2198,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2214,7 +2213,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2273,7 +2272,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2368,84 +2367,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2455,97 +2454,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/id.po b/po/id.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index d68ca5b..010d8ec 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -580,99 +580,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Skráin er tvítekin: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Skráin fannst ekki: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
-msgstr ""
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
+msgstr "Skrá %s: %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Gat ekki opnað PreUn skrá: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Skráin fannst ekki með 'glob': %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Gat ekki opnað %%files skrána %s: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "lína: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ógild skrá %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Gat ekki búið til undirferli (fork) %s: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s brást\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "gat ekki ritað öll gögn í %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "gat ekki fundið %s:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2210,8 +2209,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2225,7 +2224,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: gat ekki lesið manifest: %s\n"
@@ -2284,7 +2283,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2379,84 +2378,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2466,97 +2465,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "vantar seinni ':' á %s:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Get ekki lesið %s: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "viðfang vantar fyrir %s á %s:%d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "get ekki opnað %s á %s:%d: %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ólöglegur rofi '%s' á %s:%d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Get ekki opnað %s til lesturs: %s.\n"

diff --git a/po/it.po b/po/it.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 1c4194f..b46aea9 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -626,99 +626,98 @@ msgstr "
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "¾¤Î¥Õ¥©¡¼¥à¤ÇÆÃÊÌ¤Ê %%doc ¤òº®¤¼¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó: %s"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤¬2²óɽµ­¤µ¤ì¤Æ¤¤¤Þ¤¹: %s"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Þ¤»¤ó: %s"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s\n"
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, fuzzy, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤ÏÀèƬ¤Ë \"/\" ¤¬É¬ÍפǤ¹: %s"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "%d ¹ÔÌÜ: ¥Ð¡¼¥¸¥ç¥ó¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "¹ÔÌÜ: %s"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s ¤ò fork ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s ¼ºÇÔ"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "Á´¤Æ¤Î¥Ç¡¼¥¿¤ò %s ¤Ë½ñ¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "%s ¤òõ¤·¤Æ¤¤¤Þ¤¹: (%s ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿:"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%s-%s\n"
@@ -2365,8 +2364,8 @@ msgstr "
 msgid "can't query %s: %s\n"
 msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
@@ -2380,7 +2379,7 @@ msgstr "%s 
 msgid "old format source packages cannot be queried\n"
 msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -2440,7 +2439,7 @@ msgstr "
 msgid "record %u could not be read\n"
 msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -2541,85 +2540,85 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr "%s ¤È¤·¤Æ...\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ "
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "°Í¸À­¤Î·çÇ¡:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
@@ -2629,97 +2628,97 @@ msgstr "%s 
 msgid "read failed: %s (%d)\n"
 msgstr "Æɤ߹þ¤ß¤Î¼ºÇÔ: %s (%d)"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "2ÈÖÌܤΠ':' ¤¬¤¢¤ê¤Þ¤»¤ó(%s:%d ¤Ç)"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s:%d ¤Ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã̾¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s:%d ¤Ç¥Ç¡¼¥¿¹Ô¤¬ÉÔ´°Á´¤Ç¤¹"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s:%d ¤Ç¥Ç¡¼¥¿¹Ô¤Ë°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "ÉÔÀµ¤Ê arch/os ÈÖ¹æ: %s (%s:%d)"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s:%d ¤ÇÉÔ´°Á´¤Ê¥Ç¥Õ¥©¥ë¥È¹Ô"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s:%d ¤Ç¥Ç¥Õ¥©¥ë¥È¹Ô¤Ï°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "%s:%d ¤Ç ':' ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s ¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó %s:%d"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s ¤Î¿­Ä¥¼ºÇÔ %s:%d \"%s\""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó  %s:%d"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s ÍѤΥ¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó %s:%d"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "'%s' ¤ÎÉÔÀµ¤Ê¥ª¡¼¥×¥ó %s:%d"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.com ¤ËÏ¢Íí¤ò²¼¤µ¤¤\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "¿­Ä¥¤Ç¤­¤Þ¤»¤ó %s"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£"

diff --git a/po/ko.po b/po/ko.po
index 6ac768d..c8af2b9 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -591,99 +591,98 @@ msgstr "
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "ƯÁ¤ %%docÀ» ´Ù¸¥ Çü½Ä°ú ÇÔ²² »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "ÆÄÀÏ ¸ñ·ÏÀÌ Áߺ¹µÊ: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "BuildRoot¿¡ ½Éº¼¸¯¸µÅ©ÇÔ: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "ÆÄÀÏÀÌ prefix (%s) (¿Í)°ú ÀÏÄ¡ÇÏÁö ¾ÊÀ½: %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ/±×·ì: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "ÆÄÀÏ %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "ÆÄÀÏÀº \"/\" ·Î ½ÃÀÛÇؾßÇÔ: %s\n"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "GlobÀ» »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "ÁÙ(line): %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "À߸øµÈ ÆÄÀÏ: %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s (À»)¸¦ fork ÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "%s ¿¡ ¸ðµç ÀڷḦ ±â·ÏÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "%s (À»)¸¦ ã´Â Áß: (%s »ç¿ë)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s (À»)¸¦ ã´Âµ¥ ½ÇÆÐÇÔ:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ÆÄÀÏ Ã³¸® Áß: %s-%s-%s\n"
@@ -2258,8 +2257,8 @@ msgstr "
 msgid "can't query %s: %s\n"
 msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n"
@@ -2273,7 +2272,7 @@ msgstr "%s (
 msgid "old format source packages cannot be queried\n"
 msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
@@ -2332,7 +2331,7 @@ msgstr "
 msgid "record %u could not be read\n"
 msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
@@ -2431,84 +2430,84 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "Áغñ Áß..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... %s (À¸)·Î\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s (À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s ÆÐÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
@@ -2518,97 +2517,97 @@ msgstr "%s (
 msgid "read failed: %s (%d)\n"
 msgstr "Àдµ¥ ½ÇÆÐÇÔ: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "%s ¿¡¼­ µÎ¹ø° ':' À» ãÀ» ¼ö ¾øÀ½:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s ¿¡¼­ ¾ÆÅ°ÅØÃÄ À̸§À» ãÀ» ¼ö ¾øÀ½:%d\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s ÀÇ µ¥ÀÌÅÍ Ç׸ñ(line)ÀÌ ºÒÃæºÐÇÔ:%d\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s ÀÇ µ¥ÀÌÅÍ Ç׸ñ(line)¿¡ Àμö°¡ ³Ê¹« ¸¹À½:%d\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "À߸øµÈ ¾ÆÅ°ÅØÃÄ/¿î¿µÃ¼Á¦ ¹øÈ£: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s ÀÇ ±âº» Ç׸ñ(line)ÀÌ ºÒÃæºÐÇÔ:%d\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s ÀÇ ±âº» Ç׸ñ(line)¿¡ Àμö°¡ ³Ê¹« ¸¹À½:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s (À»)¸¦ Àдµ¥ ½ÇÆÐÇÔ: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "%2$s ¿¡¼­ ':' (0x%1$02x ãÀ½) À» ãÀ» ¼ö ¾øÀ½:%3$d\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%2$s ¿¡¼­ %1$s (À»)¸¦ À§ÇÑ Àμö¸¦ ãÀ» ¼ö ¾øÀ½:%3$d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%2$s ÀÇ %1$s È®Àå(expansion)ÀÌ ½ÇÆÐÇÔ:%3$d \"%4$s\"\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%2$s ÀÇ %1$s (À»)¸¦ ¿­ ¼ö ¾øÀ½:%3$d: %4$s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%2$s ¿¡¼­ %1$s (À»)¸¦ À§ÇÑ ¾ÆÅ°ÅØÃĸ¦ ãÀ» ¼ö ¾øÀ½:%3$d\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "%2$s ¿¡ À߸øµÈ ¿É¼Ç '%1$s':%3$d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.com À¸·Î ¿¬¶ôÁֽñ⠹ٶø´Ï´Ù\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "%s (À»)¸¦ È®Àå(expand)ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "%s (À»)¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n"
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n"

diff --git a/po/no.po b/po/no.po
index 3b4835e..27744bc 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -590,99 +590,98 @@ msgstr "Filen m
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande spesiell %%doc med andre skjema: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil listet to ganger: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolsk lenke peker til BuildRoot: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke funnet: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig eier/gruppe: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
-msgstr ""
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
+msgstr "Fil %s: %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linje %d: Filnavn ikke tillatt: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "Installerer %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke kjøre %s: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s feilet\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "kunne ikke skrive alle data til %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Klarte ikke å finne %s:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2234,8 +2233,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:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under åpning av %s: %s\n"
@@ -2249,7 +2248,7 @@ msgstr "sp
 msgid "old format source packages cannot be queried\n"
 msgstr "kildepakker i gammelt format kan ikke spørres\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
@@ -2308,7 +2307,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
@@ -2403,84 +2402,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Henter %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hopper over %s - overføring feilet - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "feil under lesing fra fil %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, 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:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "feilede avhengigheter:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "installerer binærpakker\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke åpne %s: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
@@ -2490,97 +2489,97 @@ msgstr "Installerer %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "lesing feilet: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "mangler andre ':' ved %s:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manglende navn på arkitektur ved %s:%d\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ukomplett datalinje ved %s:%d\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "For mange argumenter i datalinje ved %s:%d\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ukomplett standardlinje ved %s:%d\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "mangler ':' (fant 0x%02X) ved %s:%d\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manglende argumentfor %s ved %s:%d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan ikke åpne %s ved %s:%d %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manglende arkitektur for %s ved %s:%d\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ugyldig flagg '%s' ved %s:%d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan ikke utvide %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"

diff --git a/po/pl.po b/po/pl.po
index ba6f22a..c752414 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -616,99 +616,98 @@ msgstr "Plik musi si
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie mo¿na mieszaæ specjalnej %%doc z innymi formami: %s"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Plik podany dwukrotnie: %s"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Plik nie zgadza siê z prefiksem (%s): %s"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "B³êdny u¿ytkownik/grupa: %s\n"
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, fuzzy, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Plik %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Plik musi siê zaczynaæ od \"/\": %s"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linia %d: Wersja niedozwolona: %s"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %%files pliku: %s"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "linia: %s"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "plik %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie mo¿na uruchomiæ %s"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie mo¿na wykonaæ fork na %s"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s nie powiod³o siê"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "zapisanie wszystkich danych do %s nie powiod³o siê"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Wyszukiwanie wymaganych zasobów...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Wyszukiwanie nie powiod³o siê"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plików: %s\n"
@@ -2322,8 +2321,8 @@ msgstr "pakiet nie ma ani w
 msgid "can't query %s: %s\n"
 msgstr "nie mo¿na odwi±zaæ %s: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod³o siê\n"
@@ -2337,7 +2336,7 @@ msgstr "odpytywanie %s nie powiod
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -2397,7 +2396,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:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2495,85 +2494,85 @@ msgstr "       rpm {--version}"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr "... jako %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "b³±d czytania z pliku %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "plik %s wymaga nowszej wersji RPM\n"
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie mo¿e byæ zainstalowany\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, 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:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "niespe³nione zale¿no¶ci:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "instalacja pakietów binarnych\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie mo¿na otworzyæ pliku %s: %s"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" okre¶la wiele pakietów\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
@@ -2583,97 +2582,97 @@ msgstr "Instalacja %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "odczyt nie powiód³ siê: %s (%d)"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "brak drugiego ':' przy %s:%d"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "brak nazwy architektury przy %s:%d"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Niekompletna linia danych przy %s:%d"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Zbyt wiele argumentów w linii danych przy %s:%d"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "B³êdny numer arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Niekompletna domy¶lna linia przy %s:%d"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Zbyt wiele argumentów w linii domy¶lnej przy %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Odczytanie %s nie powiod³o siê: %s."
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "brak ':' przy %s:%d"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "brak argumentu dla %s przy %s:%d"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s: Open nie powiod³o siê\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nie mo¿na otworzyæ %s przy %s:%d"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "brak architektury dla %s przy %s:%d"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "b³êdna opcja '%s' przy %s:%d"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Nieznany system: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Skontaktuj siê, proszê, z rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Nie mo¿na rozszerzyæ %s"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."

diff --git a/po/pt.po b/po/pt.po
index ad368a6..e40cccf 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -586,99 +586,98 @@ msgstr "O ficheiro tem de come
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Não é possível misturar o %%doc especial com outras formas: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Ficheiro listado duas vezes: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "A 'symlink' aponta para a BuildRoot: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "O ficheiro não corresponde ao prefixo (%s): %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Ficheiro não encontrado: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Dono/grupo inválido: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Ficheiro: %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "O ficheiro precisa de começar por \"/\": %s\n"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linha %d: Nome do ficheiro não permitido: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Ficheiro não encontrado pelo glob: %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ficheiro inválido: %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Não consegui executar o %s: %S\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Não consegui executar à parte o %s: &s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "O %s falhou\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "não consegui escrever todos os dados em %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "A procurar o %s: (usando o %s)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Não consegui encontrar o %s:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "A processar os ficheiros: %s-%s-%s\n"
@@ -2248,8 +2247,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:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
@@ -2263,7 +2262,7 @@ msgstr "a pesquisa do %s falhou\n"
 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:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -2322,7 +2321,7 @@ msgstr "n
 msgid "record %u could not be read\n"
 msgstr "o registo %d não pôde ser lido\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s não está instalado\n"
@@ -2421,84 +2420,84 @@ msgstr "  %s     A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "A preparar..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "A preparar os pacotes para a instalação..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... como %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "a ignorar o %s - a transferência falhou - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, 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:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erro ao ler do ficheiros %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, 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:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "o %s não pode ser instalado\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, 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:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "dependências falhadas:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "a instalar os pacotes binários\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "não consigo aceder ao ficheiro %s: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "o \"%s\" especifica vários pacotes\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "a remoção destes pacotes irá quebrar dependências:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "não consigo aceder ao %s: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "A instalar o %s\n"
@@ -2508,97 +2507,97 @@ msgstr "A instalar o %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "a leitura falhou: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "falta o segundo ':' em %s:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "falta o nome da arquitectura em %s:%d\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Linha de dados incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Demasiados argumentos na linha de dados em %s:%d\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Número de arq./SO errado: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Linha por omissão incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Demasiados argumentos na linha por omissão em %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Não consegui ler o %s: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "falta um ':' (encontrado um 0x%02x) em %s:%d\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "faltam argumentos para o %s em %s:%d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "a expansão do %s falhou em %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "não consigo abrir o %s em %s:%d: %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "falta a arquitectura para o %s em %s:%d\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "má opção '%s' em %s:%d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Sistema desconhecido: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Por favor contacte o rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Não consigo expandir o %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n"
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Não consegui abrir o %s para leitura: %s.\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4dd0d7b..e5fbe4d 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -648,108 +648,108 @@ msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
 # , c-format
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
-msgstr ""
+# , c-format
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
+msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
 # , c-format
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "Construo falhou.\n"
 
 # , c-format
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2446,8 +2446,8 @@ msgstr "no foi passado pacote para instalao"
 msgid "can't query %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construo falhou.\n"
@@ -2462,7 +2462,7 @@ msgid "old format source packages cannot be queried\n"
 msgstr ""
 
 # , c-format
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2522,7 +2522,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
@@ -2623,11 +2623,11 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "no foi passado pacote para instalao"
@@ -2640,81 +2640,81 @@ 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:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 #, fuzzy
 msgid "failed dependencies:\n"
 msgstr "lista dependncias do pacote"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 #, fuzzy
 msgid "removing these packages would break dependencies:\n"
 msgstr "lista dependncias do pacote"
 
 # , c-format
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2725,103 +2725,103 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "No consegui abrir: %s\n"

diff --git a/po/ro.po b/po/ro.po
index 7aaea3b..2349c35 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -580,99 +580,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2199,8 +2198,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2214,7 +2213,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2273,7 +2272,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2368,84 +2367,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2455,97 +2454,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index 2c31688..908ae51 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 48f080d..8403329 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -603,99 +603,98 @@ msgstr "
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "îÅÌØÚÑ ÓÍÅÛÉ×ÁÔØ ÓÐÅÃ. %%doc Ó ÄÒÕÇÉÍÉ ÆÏÒÍÁÍÉ: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "æÁÊÌ ÕËÁÚÁÎ Ä×ÁÖÄÙ: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "óÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ ÕËÁÚÙ×ÁÅÔ ÎÁ BuildRoot: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "æÁÊÌ ÎÅ ÓÏÏÔ×ÅÔÓÔÕÅÔ ÐÒÅÆÉËÓÕ (%s): %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ×ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "æÁÊÌ %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s\n"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob ÎÅ ÒÁÚÒÅÛÁÀÔÓÑ: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "ÓÔÒÏËÁ: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "óÂÏÊ ×ÅÔ×ÌÅÎÉÑ %s: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s ÎÅ ÕÄÁÌÏÓØ\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "ðÏÉÓË %s (ÉÓÐÏÌØÚÕÑ %s): ...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀÔÓÑ ÆÁÊÌÙ: %s-%s-%s\n"
@@ -2265,8 +2264,8 @@ msgstr "
 msgid "can't query %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
@@ -2280,7 +2279,7 @@ msgstr "
 msgid "old format source packages cannot be queried\n"
 msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n"
@@ -2339,7 +2338,7 @@ msgstr "
 msgid "record %u could not be read\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
@@ -2438,84 +2437,84 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... ËÁË %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n"
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
@@ -2525,97 +2524,97 @@ msgstr "
 msgid "read failed: %s (%d)\n"
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ×ÔÏÒÏÅ ':' × %s:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÎÁÚ×ÁÎÉÅ ÁÒÈÉÔÅËÔÕÒÙ × %s:%d\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "îÅÐÏÌÎÁÑ ÓÔÒÏËÁ ÄÁÎÎÙÈ × %s:%d\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ÄÁÎÎÙÈ × %s:%d\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ arch/os: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "îÅÐÏÌÎÁÑ ÓÔÒÏËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ × %s:%d\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ÐÏ ÕÍÏÌÞÁÎÉÀ × %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ %s: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ':' (ÎÁÊÄÅÎ 0x%02x) × %s:%d\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÇÕÍÅÎÔ ÄÌÑ %s × %s:%d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "ÏÛÉÂËÁ ÒÁÓËÒÙÔÉÑ %s ÎÁ %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s × %s:%d %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÈÉÔÅËÔÕÒÁ ÄÌÑ %s × %s:%d\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ÎÅ×ÅÒÎÙÊ ÐÁÒÁÍÅÔÒ '%s' × %s:%d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÁ: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "ó×ÑÖÉÔÅÓØ Ó rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÎÁÞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n"
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n"

diff --git a/po/sk.po b/po/sk.po
index 5ce6613..6554df4 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -614,99 +614,98 @@ msgstr "S
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie je mo¾né mie¹a» ¹peciálne %%doc s inými formami: %s"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Súbor zadaný dvakrát: %s."
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Súbor nesúhlasí s prefixom (%s): %s."
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Súbor nebol nájdený: %s"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Chybný vlastník/skupina: %s\n"
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, fuzzy, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Súbor %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Súbor potrebuje na zaèiatku \"/\": %s"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "riadok %d: V %s sú vy¾adované verzie: %s"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Súbor nebol nájdený: %s"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "riadok: %s"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "súbor %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie je mo¾né spusti» %s"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie je mo¾né vytvori» proces %s"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s zlyhalo"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "nepodarilo sa zapísa» v¹etky dáta do %s"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Zis»ujú sa po¾adované vlastnosti...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Nepodarilo sa zisti» poskytované vlastnosti"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Spracovávajú sa súbory: %s\n"
@@ -2319,8 +2318,8 @@ msgstr "bal
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
@@ -2334,7 +2333,7 @@ msgstr "ot
 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:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -2394,7 +2393,7 @@ msgstr "po
 msgid "record %u could not be read\n"
 msgstr "záznam %d nie je mo¾né preèíta»\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nain¹talovaný\n"
@@ -2492,85 +2491,85 @@ msgstr "          rpm {--version}"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr "... ako %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie je mo¾né nain¹talova»\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, 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:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "nevyrie¹ené závislosti:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "in¹talujú sa binárne balíky\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie je mo¾né otvori» súbor %s: %s"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie je mo¾né otvori» %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "In¹taluje sa %s\n"
@@ -2580,97 +2579,97 @@ msgstr "In
 msgid "read failed: %s (%d)\n"
 msgstr "èítanie zlyhalo: %s (%d)"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "chýbajúce druhé ':' na %s:%d"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "chýba názov architektúry na %s:%d"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Neúplný riadok údajov na %s:%d"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Priveµa argumentov v riadku údajov na %s:%d"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Chybné èíslo arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Neúplný implicitný riadok na %s:%d"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Priveµa argumentov v implicitnom riadku na %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Nie je mo¾né preèíta» %s: %s."
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "chýbajúca ':' na %s:%d"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "chýbajúci argument pre %s na %s:%d"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "expanzia %s zlyhala na %s:%d \"%s\""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nie je mo¾né otvori» %s na %s:%d"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "chýbajúca architektúra pre %s na %s:%d"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "chybná voµba '%s' na %s:%d"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámy systém: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Nie je mo¾né expandova» %s"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."

diff --git a/po/sl.po b/po/sl.po
index 6e3a3fa..a4a8ebf 100644 (file)
--- 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.222 2002/01/23 00:59:15 jbj Exp $
+# $Id: sl.po,v 1.223 2002/01/27 16:49:09 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -612,99 +612,98 @@ msgstr "Ime datoteke se mora za
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Posebnih %%doc ni mo¾no me¹ati z ostalimi oblikami: %s"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Datoteka je navedena dvakrat: %s"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, fuzzy, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Simbolna povezava ka¾e na BuildRoot: %s -> %s"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Datoteka se ne ujema s predpono (%s): %s"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datoteke ni mogoèe najti: %s"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Neobstojeè lastnik/skupina: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Datoteka: %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Datoteki manjka uvodni \"/\": %s"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "vrstica %d: Razlièica ni dovoljena: %s"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "vrstica: %s"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Po¹kodovana datoteka: %s: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ni mo¾no izvesti %s: %s"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Vejitev %s ni mo¾na: %s"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s neuspe¹en"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "pisanje podatkov v %s je bilo neuspe¹no"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Iskanje  %s: (z uporabo %s)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Neuspe¹no iskanje %s:"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Obdeloavnje datotek: %s-%s-%s\n"
@@ -2318,8 +2317,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:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
@@ -2333,7 +2332,7 @@ msgstr "poizvedba po %s je bila neuspe
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2393,7 +2392,7 @@ msgstr "
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni mo¾no prebrati\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name¹èen\n"
@@ -2492,85 +2491,85 @@ 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/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "paketi za namestitev niso navedeni"
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... kot %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketa %s ni mo¾no premakniti\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "napaka pri branju iz datoteke %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, 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:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ni mo¾no namestiti\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "neuspe¹ne soodvisnosti:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "name¹èanje binarnih paketov\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ni mo¾no odpreti datoteke %s: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" doloèa veè paketov\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ni mo¾no odpreti %s: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Name¹èanje %s\n"
@@ -2580,97 +2579,97 @@ msgstr "Name
 msgid "read failed: %s (%d)\n"
 msgstr "branje je bilo neuspe¹no: %s (%d)"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "manjka drugi ,:` v %s:%d"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manjkajoèe ime arhitekture v %s:%d"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Nepopolna podatkovna vrstica v %s:%d"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Preveè argumentov v podatkovni vrstici v %s:%d"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Okvarjena ¹tevilka arh./op.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Nepopolna privzeta vrstica v %s:%d"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Preveè argumentov v privzeti vrstici v %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Neuspe¹no branje %s: %s."
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "manjkajoèi ,:` (najden 0x%02x) v %s:%d"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manjkajoèi argument za %s v %s:%d"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "raz¹iritev %s je bila neuspe¹na v %s:%d \"%s\""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "ni mo¾no odpreti %s v %s:%d: %s"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manjkajoèa arhitektura za %s v %s:%d"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "nepravilna izbira ,%s` v %s:%d"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznan sistem: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Prosimo, pi¹ite na rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Ni mo¾no raz¹iriti %s"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, fuzzy, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Ni mo¾no prebrati %s, HOME je prevelik."
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s ni mo¾no odpreti za branje: %s."

diff --git a/po/sr.po b/po/sr.po
index 2ba8602..5a239a2 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -602,99 +602,98 @@ msgstr "preme
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datoteka nije pronaðena na serveru"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, fuzzy, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteka nije pronaðena na serveru"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ne mogu da izvr¹im PGP"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Ne mogu da proèitam 'sigtarget'"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "PGP omanuo"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -2312,8 +2311,8 @@ msgstr "paket nema imena"
 msgid "can't query %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
@@ -2327,7 +2326,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:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -2387,7 +2386,7 @@ msgstr "pogre
 msgid "record %u could not be read\n"
 msgstr "ne mogu da proèitam slog %d\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
@@ -2486,86 +2485,86 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "lo¹e meðuzavisnosti:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" odreðuje vi¹e paketa\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
@@ -2575,97 +2574,97 @@ msgstr "Instaliram %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "neuspelo èitanje: %s (%d)"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "nedostaje drugo ':' na %s:%d"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "nedostaje ime arhitekture na %s:%d"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Nepotpuna linija podataka na %s:%d"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Premnogo argumenata u liniji podataka na %s:%d"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Lo¹ broj arhitekture/oper.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Nepotpuna podrazumevana linija na %s:%d"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Premnogo argumenata u podrazumevanoj liniji na %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "nedostaje ':' na %s:%d"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "nedostaje argument za %s na %s:%d"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "lo¹a opcija '%s' na %s:%d"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"

diff --git a/po/sv.po b/po/sv.po
index b0e8d02..78bf948 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -594,99 +594,98 @@ msgstr "Filnamn m
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan inte blanda special %%doc med andra former: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Filen uppräknad två gånger: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolisk länk pekar på BuildRoot: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Filen matchar inte prefixet (%s): %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Filen hittades inte: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Felaktig ägare/grupp: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Fil %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Filen behöver inledande \"/\": %s\n"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Matchning inte tillåtet: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Hittade ingen fil vid matchningen: %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunde inte öppna %%files-fil %s: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "rad: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Felaktig fil: %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunde inte köra %s: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunde inte grena %s: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s misslyckades\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "kunde inte skriva all data till %s\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Letar upp %s: (använder %s)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Misslyckades med att hitta %s:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
@@ -2249,8 +2248,8 @@ msgstr "paketet har varken fil
 msgid "can't query %s: %s\n"
 msgstr "kan inte fråga %s: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att öppna %s: %s\n"
@@ -2264,7 +2263,7 @@ msgstr "fr
 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:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: läsning av paketlista misslyckades: %s\n"
@@ -2323,7 +2322,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:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
@@ -2422,84 +2421,84 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "Förbereder paket för installation ..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hoppar över %s - överföring misslyckades - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s är inte relokerbart\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fel vid läsning från fil %s\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, 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:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d käll- och %d binärpaket\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "ouppfyllda beroenden:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "installerar binärpaket\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan inte öppna filen %s: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" anger flera paket\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
@@ -2509,97 +2508,97 @@ msgstr "Installerar %s\n"
 msgid "read failed: %s (%d)\n"
 msgstr "läsning misslyckades: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "andra \":\" saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "arkitekturnamn saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ofullständig datarad vid %s:%d\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "För många argument i datarad vid %s:%d\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Felaktigt arkitektur-/os-nummer: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ofullständig standardvärdesrad vid %s:%d\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "För många argument i standardvärdesrad vid %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Misslyckades med att läsa %s: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "\":\" saknas (hittade 0x%02x) vid %s:%d\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "argument till %s saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s expansion misslyckades vid %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan inte öppna %s vid %s:%d: %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "arkitektur saknas för %s vid %s:%d\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "okänd flagga \"%s\" vid %s:%d\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Okänt system: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Var vänlig kontakta rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan inte expandera %s\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Kan inte läsa %s, HOME är för stor.\n"
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kan inte öppna %s för läsning: %s.\n"

diff --git a/po/tr.po b/po/tr.po
index f83c091..e6225d3 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -601,99 +601,98 @@ msgstr "Dosya \"/\" ile ba
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Özel %%doc ile diðer formlar karýþtýrýlamaz: %s\n"
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Dosya iki kere gösterildi: %s\n"
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Sembolik bað BuildRoot gösteriyor: %s -> %s\n"
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Dosya önek (%s) ile uyumsuz: %s\n"
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Dosya bulunamadý: %s\n"
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Kullanýcý/grup hatalý: %s\n"
 
-#: build/files.c:1554
-#, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+#: build/files.c:1571
+#, fuzzy, c-format
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr "Dosya %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Dosya \"/\" ile içermeli: %s\n"
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "satýr %d: Dosya adý uygun deðil: %s\n"
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Dosya glob tarafýndan bulunamadý: %s\n"
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n"
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr "satýr: %s\n"
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Dosya hatalý: %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s ayrýlamadý: %s\n"
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr "%s baþarýsýz\n"
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "tüm veri %s içine yazýlamadý\n"
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "%s aranýyor: (%s kullanarak)...\n"
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s bulunamadý:\n"
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Ýþlenen dosyalar: %s-%s-%s\n"
@@ -2272,8 +2271,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi i
 msgid "can't query %s: %s\n"
 msgstr "%s sorgulanamýyor: %s\n"
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s açýlamadý: %s\n"
@@ -2287,7 +2286,7 @@ msgstr "%s 'nin sorgulamas
 msgid "old format source packages cannot be queried\n"
 msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma baþarýsýz: %s\n"
@@ -2346,7 +2345,7 @@ msgstr "paket kay
 msgid "record %u could not be read\n"
 msgstr "%u. kayýt okunamadý\n"
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu deðil\n"
@@ -2445,84 +2444,84 @@ 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/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr "Hazýrlanýyor..."
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr "Kurulacak paketler hazýrlanýyor..."
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, 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:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr "... %s olarak\n"
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n"
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s paketi yeniden konumlandýrýlamaz\n"
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s dosyasýndan okuma hatalý\n"
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, 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:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s yüklenemedi\n"
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr "baðýmlýlýklarda hata; gerekli paketler:\n"
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr "icra edilebilir paketleri kuruluyor\n"
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s dosyasý açýlamadý: %s\n"
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr "bu paketin silinmesi aþaðýdakilerin baðýmlýlýklarýný etkileyecektir:\n"
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s kuruluyor\n"
@@ -2532,97 +2531,97 @@ msgstr "%s kuruluyor\n"
 msgid "read failed: %s (%d)\n"
 msgstr "okuma baþarýsýz: %s (%d)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "%s:%d - ikinci ':' eksik\n"
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s:%d - mimari ismi eksik\n"
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s:%d - veri satýrý tamamlanmamýþ\n"
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s:%d - veri satýrýnda çok fazla argüman\n"
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "arch/os numarasý hatalý: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s:%d - öntanýmlý satýr tamamlanmamýþ\n"
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s:%d - öntanýmlý satýrda çok fazla argüman\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s okunamadý: %s.\n"
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "(0x%02x bulundu) %s:%d de ':' yok\n"
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s için %s:%d de argüman eksik\n"
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s geniþletmesi %s:%d \"%s\" de baþarýsýz \n"
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%s dosyasý açýlamýyor (%s:%d): %s\n"
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s için %s:%d'de eksik mimari\n"
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "seçenek '%s' (%s:%d) de hatalý\n"
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Bilinmeyen sistem: %s\n"
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Lütfen rpm-list@redhat.com listesine üye olun\n"
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "%s geniþletilemiyor\n"
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "%s okunamýyor, EV çok büyük\n"
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s okuma eriþimi için açýlamadý: %s.\n"

diff --git a/po/uk.po b/po/uk.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/wa.po b/po/wa.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/zh.po b/po/zh.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 5888c43..ef1c714 100644 (file)
--- 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-01-22 09:52-0500\n"
+"POT-Creation-Date: 2002-01-27 11:31-0500\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"
@@ -585,99 +585,98 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#. Two entries for the same file found, merge the entries.
-#: build/files.c:1113
+#: build/files.c:1110
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1260
+#: build/files.c:1254
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1475
+#: build/files.c:1491
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1515
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1542 build/files.c:2156 build/parsePrep.c:50
+#: build/files.c:1558 build/files.c:2174 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1554
+#: build/files.c:1571
 #, c-format
-msgid "File %4d: %07o %s.%s\t %s\n"
+msgid "File%5d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1658
+#: build/files.c:1676
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1681
+#: build/files.c:1699
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1696
+#: build/files.c:1714
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1776
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:146
+#: build/files.c:1787 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2144
+#: build/files.c:2162
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2218
+#: build/files.c:2236
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2223
+#: build/files.c:2241
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2307
+#: build/files.c:2325
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2311
+#: build/files.c:2329
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2447
+#: build/files.c:2465
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2473 build/files.c:2487
+#: build/files.c:2491 build/files.c:2505
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2608
+#: build/files.c:2626
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2204,8 +2203,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:840
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2219,7 +2218,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:647 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2278,7 +2277,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:848 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2373,84 +2372,84 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:155
+#: lib/rpminstall.c:160
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:162
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:276
+#: lib/rpminstall.c:281
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:293
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:292
+#: lib/rpminstall.c:297
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:390
+#: lib/rpminstall.c:395
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:444
+#: lib/rpminstall.c:449
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:450
+#: lib/rpminstall.c:455
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:696
+#: lib/rpminstall.c:467 lib/rpminstall.c:701
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:498
+#: lib/rpminstall.c:503
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:516
+#: lib/rpminstall.c:521
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:539
+#: lib/rpminstall.c:544
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:561
+#: lib/rpminstall.c:566
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:631
+#: lib/rpminstall.c:636
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:655
+#: lib/rpminstall.c:660
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:682
+#: lib/rpminstall.c:687
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:693
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2460,97 +2459,97 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:191
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:345
+#: lib/rpmrc.c:348
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:350
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:361
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:395
+#: lib/rpmrc.c:398
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:400
+#: lib/rpmrc.c:403
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:570
+#: lib/rpmrc.c:573
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:608
+#: lib/rpmrc.c:611
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:625 lib/rpmrc.c:699
+#: lib/rpmrc.c:628 lib/rpmrc.c:702
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:642 lib/rpmrc.c:664
+#: lib/rpmrc.c:645 lib/rpmrc.c:667
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:651
+#: lib/rpmrc.c:654
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:691
+#: lib/rpmrc.c:694
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:758
+#: lib/rpmrc.c:761
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1368
+#: lib/rpmrc.c:1386
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1369
+#: lib/rpmrc.c:1387
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1594
+#: lib/rpmrc.c:1612
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1599
+#: lib/rpmrc.c:1617
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1616
+#: lib/rpmrc.c:1634
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""

diff --git a/rpm.spec b/rpm.spec
index 1aa036e..c79dd44 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -164,9 +164,9 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --loc
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix}
 %endif
 
-# XXX workaround alpha sha1 digest miscompilation
-%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
-make CFLAGS="-g -O0" digest.o digest.lo -C rpmio
+# XXX workaround ia64 gcc-3.1-0.18 miscompilation
+%ifarch ia64
+make CFLAGS="-g -O0 -DIA64_SUCKS_ROCKS" files.o files.lo -C build
 %endif
 
 make
@@ -618,3 +618,8 @@ fi
 - splint fiddles.
 - ppc64 arch added (#58634,#58636).
 - turn on auto-generated perl requirements (#58519, #58536, #58537).
+- fix: %exclude functional (again).
+- trap SIGILL for ppc64 inline asm voodoo fix from cross-dressed ppc32.
+- rpm-perl: force numeric comparison on rpm version (#58882).
+- fix: fancy hash fiddles if not a tty.
+- fix: handle /.../ correctly in rpmCleanPath().

diff --git a/rpm.spec.in b/rpm.spec.in
index 2eebfd7..ac8292d 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -164,9 +164,9 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --loc
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix}
 %endif
 
-# XXX workaround alpha sha1 digest miscompilation
-%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
-make CFLAGS="-g -O0" digest.o digest.lo -C rpmio
+# XXX workaround ia64 gcc-3.1-0.18 miscompilation
+%ifarch ia64
+make CFLAGS="-g -O0 -DIA64_SUCKS_ROCKS" files.o files.lo -C build
 %endif
 
 make
@@ -618,3 +618,8 @@ fi
 - splint fiddles.
 - ppc64 arch added (#58634,#58636).
 - turn on auto-generated perl requirements (#58519, #58536, #58537).
+- fix: %exclude functional (again).
+- trap SIGILL for ppc64 inline asm voodoo fix from cross-dressed ppc32.
+- rpm-perl: force numeric comparison on rpm version (#58882).
+- fix: fancy hash fiddles if not a tty.
+- fix: handle /.../ correctly in rpmCleanPath().

diff --git a/rpmio/macro.c b/rpmio/macro.c
index 8523aef..8bb179a 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1804,7 +1804,12 @@ char *rpmCleanPath(char * path)
            /*@switchbreak@*/ break;
        case '.':
            /* Leading .. is special */
-           if (begin && s[1] == '.') {
+           /* Check that it is ../, so that we don't interpret */
+           /* ..?(i.e. "...") or ..* (i.e. "..bogus") as "..". */
+           /* in the case of "...", this ends up being processed*/
+           /* as "../.", and the last '.' is stripped.  This   */
+           /* would not be correct processing.                 */
+           if (begin && s[1] == '.' && (s[2] == '/' || s[2] == '\0')) {
 /*fprintf(stderr, "    leading \"..\"\n"); */
                *t++ = *s++;
                /*@switchbreak@*/ break;