- fix: reading macro files can corrupt memory if BUFSIZ is teensy.

- fix: assertion failure iff incomplete package install (#66837).

CVS patchset: 5519
CVS date: 2002/06/21 18:00:50

diff --git a/CHANGES b/CHANGES
index 8801e24..42368d2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -140,6 +140,8 @@
        - don't install /usr/lib/rpm/redhat per-vendor configuration anymore.
        - add translated man pages from PLD.
        - resurrect libelf with Elf64, prelink verify should work everywhere.
+       - fix: reading macro files can corrupt memory if BUFSIZ is teensy.
+       - fix: assertion failure iff incomplete package install (#66837).
 
 4.0.3 -> 4.0.4:
        - solaris: translate i86pc to i386 (#57182).

diff --git a/Makefile.am b/Makefile.am
index 42517ba..e3940b7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,7 +110,6 @@ lclint:
                `make -s sources -C rpmdb` \
                `make -s sources -C rpmio` \
                `make -s sources -C beecrypt` \
-               `make -s sources -C libelf` \
                `make -s sources -C popt`
 
 CVSTAG = r$(subst .,-,$(VERSION))

diff --git a/lib/fsm.c b/lib/fsm.c
index 4ad21a2..a3f36cd 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -451,6 +451,7 @@ static int saveHardLink(/*@special@*/ /*@partial@*/ FSM_t fsm)
 /** \ingroup payload
  * Destroy set of hard links.
  * @param li           set of hard links
+ * @return             NULL always
  */
 static /*@null@*/ void * freeHardLink(/*@only@*/ /*@null@*/ struct hardLink_s * li)
        /*@modifies li @*/

diff --git a/lib/transaction.c b/lib/transaction.c
index 50f3600..84a7b1c 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -569,8 +569,7 @@ static void handleOverlappedFiles(const rpmts ts,
            otherFileNum = findFps(fiFps, otherFps, otherFc);
            (void) rpmfiSetFX(otherFi, otherFileNum);
 
-           /* XXX is this test still necessary? */
-assert(otherFi->actions[otherFileNum] != FA_UNKNOWN);
+           /* XXX Happens iff fingerprint for incomplete package install. */
            if (otherFi->actions[otherFileNum] != FA_UNKNOWN)
                /*@innerbreak@*/ break;
        }

diff --git a/libelf/lib/.cvsignore b/libelf/lib/.cvsignore
index e74f671..f021651 100755 (executable)
--- a/libelf/lib/.cvsignore
+++ b/libelf/lib/.cvsignore
@@ -1,7 +1,10 @@
 .deps
 .depend
-Makefile
 .libs
+Makefile
+Makefile.in
+*.o
 *.la
 *.lo
-sys_elf.h
+stamp-h
+stamp-h2

diff --git a/libelf/lib/gelf.h b/libelf/lib/gelf.h
index 1dfeda0..e5c9567 100755 (executable)
--- a/libelf/lib/gelf.h
+++ b/libelf/lib/gelf.h
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #ifndef _GELF_H
 #define _GELF_H
+/*@-declundef -enummemuse -fcnuse -typeuse -varuse @*/
 
 #if __LIBELF_INTERNAL__
 #include <libelf.h>
@@ -187,4 +188,5 @@ extern size_t             gelf_msize __P((Elf *elf, Elf_Type type, size_t count,
 }
 #endif /* __cplusplus */
 
+/*@=declundef =enummemuse =fcnuse =typeuse =varuse @*/
 #endif /* _GELF_H */

diff --git a/libelf/lib/libelf.h b/libelf/lib/libelf.h
index d30a7f2..8468540 100755 (executable)
--- a/libelf/lib/libelf.h
+++ b/libelf/lib/libelf.h
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #ifndef _LIBELF_H
 #define _LIBELF_H
+/*@-declundef -enummemuse -fcnuse -typeuse -varuse @*/
 
 #include <sys/types.h>
 
@@ -330,4 +331,5 @@ extern size_t elf_delscn __P((Elf *elf, /*@only@*/ Elf_Scn *scn))
 }
 #endif /* __cplusplus */
 
+/*@=declundef =enummemuse =fcnuse =typeuse =varuse @*/
 #endif /* _LIBELF_H */

diff --git a/macros.in b/macros.in
index a3a29a5..6f7c2b5 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: /usr/lib/rpm/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.101 2002/06/20 02:19:21 jbj Exp $
+# $Id: macros.in,v 1.102 2002/06/21 18:00:50 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -492,10 +492,15 @@
 
 #
 # XXX rpm-4.1 verifies prelinked libraries using a prelink undo helper.
+#      Normally this macro is defined in /etc/rpm/macros.prelink, installed
+#      with the prelink package. If the macro is undefined, then prelinked
+#      shared libraries contents are MD5 digest verified (as usual), rather
+#      than MD5 verifying the output of the prelink undo helper.
+#
 #      Note: The 2nd token is used as argv[0] and "library" is a
 #      placeholder that will be deleted and replaced with the appropriate
 #      library file path.
-%__prelink_undo_cmd     /usr/sbin/prelink prelink -y library
+#%__prelink_undo_cmd     /usr/sbin/prelink prelink -y library
 
 #==============================================================================
 # ---- Transaction macros.

diff --git a/po/cs.po b/po/cs.po
index b4f3f78..340f197 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1564,37 +1564,37 @@ msgstr "========= Adres
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr "vytvoøen adresáø %s s právy %04o.\n"
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s ulo¾eno jako %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s odstranìní %s selhalo: Adresáø není prázdný\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s rmdir %s selhal: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s unlink %s selhal: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s vytvoøen jako %s\n"
@@ -2827,7 +2827,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3177,93 +3177,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr "Nelze pøejmenovat %s na %s: %m\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznámý typ ikony: %s\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Glob není dovolen: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/da.po b/po/da.po
index af246e3..5dba3ac 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -1562,37 +1562,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "linie %d: %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gemt som %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "kan ikke fjerne %s - katalog ikke tomt\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "åbning af %s mislykkedes %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s oprettet som %s\n"
@@ -2836,7 +2836,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
@@ -3190,93 +3190,93 @@ msgstr "fjerner kataloget %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiv %d tom %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makroen %%%s har et uafsluttet indhold (body)\n"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makroen %%%s har et ugyldig navn (%%define)\n"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makroen %%%s har uafsluttede parametre\n"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makroen %%%s har intet indhold\n"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makroen %%%s kunne ikke udfoldes\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makroen %%%s har ugyldigt navn (%%undefine)\n"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) blev ikke brugt under niveau %d\n"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Ukendt tilvalg %c i %s(%s)\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Rekursionsdybde(%d) overskrider maks(%d)\n"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Uafsluttet %c: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Et %% efterfølges af en makro, der ikke kan tolkes\n"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Makroen %%%.*s blev ikke fundet, overspringer\n"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr "Overløb i målbuffer\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Filen %s er mindre end %u byte\n"

diff --git a/po/de.po b/po/de.po
index 995e364..4053a95 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -1699,37 +1699,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "Entfernen von %s fehlgeschlagen: %s"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "kann Datei %s nicht öffnen: "
@@ -3019,7 +3019,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
@@ -3379,94 +3379,94 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "(unbekannter Typ)"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/en_RN.po b/po/en_RN.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/es.po b/po/es.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/eu_ES.po b/po/eu_ES.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index 1e4ea1b..e33527a 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1585,37 +1585,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "en voi poistaa %s -hakemisto ei ole tyhjä"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s:n rmdir epäonnistui: %s"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -2887,7 +2887,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
@@ -3240,93 +3240,93 @@ msgstr "virhe luotaessa hakemistoa %s: %s"
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "(tuntematon tyyppi)"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index 3448fc8..15ea152 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1613,37 +1613,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2924,7 +2924,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3276,93 +3276,93 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/gl.po b/po/gl.po
index bbf3f88..b040d0a 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -1524,37 +1524,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2743,7 +2743,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3091,93 +3091,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/id.po b/po/id.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index 0b3ca6d..8f3cd42 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1532,37 +1532,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s vistað sem %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s rmdir %s brást: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s gat ekki eytt %s: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s búið til sem %s\n"
@@ -2764,7 +2764,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3112,93 +3112,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== virkt %d tómt %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tómt)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tómt)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Óþekkt viðfang %c í %s(%s)\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Fjölvi %%%.*s fannst ekki. Sleppi\n"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Skrá %s: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Skráin %s er minni en %u bæti\n"

diff --git a/po/it.po b/po/it.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 6927a67..db1cc2e 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -1610,37 +1610,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "%d ¹ÔÌÜ: %s"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Þ¤»¤ó"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹"
@@ -2935,7 +2935,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
@@ -3289,94 +3289,94 @@ msgstr "
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== ¥¢¥¯¥Æ¥£¥Ö %d ¥¨¥ó¥×¥Æ¥£ %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "¥Þ¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%define)"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "¥Þ¥¯¥í %%%s ¤Ï opts ¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "¥Þ¥¯¥í %%%s ¤Ï¶õ¤Î¥Ü¥Ç¥£¤Ç¤¹"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "¥Þ¥¯¥í %%%s ¤Ï¿­Ä¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%undefine)"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礭¤¤"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, fuzzy, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ­¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡¢¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥Õ¥í¡¼"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, fuzzy, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹"

diff --git a/po/ko.po b/po/ko.po
index d3d42ce..1e58fd0 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -1548,37 +1548,37 @@ msgstr "========= 
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr "%2$04oÀÇ Çã°¡±Ç(perms)À» °¡Áø %1$s µð·ºÅ丮°¡ »ý¼ºµÇ¾ú½À´Ï´Ù.\n"
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼­ ¾ÆÄ«À̺ê ÆÄÀÏ %s(À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s(ÀÌ)°¡ %s(À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: ºó µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s %s ¸µÅ© ÇØÁ¦¿¡ ½ÇÆÐÇÔ: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s(ÀÌ)°¡ %s(À¸)·Î »ý¼ºµÇ¾ú½À´Ï´Ù\n"
@@ -2812,7 +2812,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
@@ -3168,93 +3168,93 @@ msgstr "%s 
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d È°¼º %d ºñ¾îÀÖÀ½\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(ºñ¾îÀÖÀ½)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(ºñ¾îÀÖÀ½)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "¸ÅÅ©·Î %%%s¿¡ Á¾·áµÇÁö ¾ÊÀº ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "¸ÅÅ©·Î %%%s¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%define)\n"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "¸ÅÅ©·Î %%%s¿¡ Á¾·áµÇÁö ¾ÊÀº ¿É¼ÇÀÌ ÀÖ½À´Ï´Ù\n"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "¸ÅÅ©·Î %%%s¿¡ ºñ¾îÀÖ´Â ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "¸ÅÅ©·Î %%%s(À»)¸¦ È®Àå(expand)Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "¸ÅÅ©·Î %%%s¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%undefine)\n"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "¸ÅÅ©·Î %%%s (%s)´Â ·¹º§ %d ÀÌÇÏ¿¡¼­´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%2$s(%3$s)¿¡ ¾Ë ¼ö ¾ø´Â ¿É¼Ç %1$c(ÀÌ)°¡ ÀÖ½À´Ï´Ù\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "¹Ýº¹ Ƚ¼ö(%d)°¡ ÃÖ´ëÄ¡(%d) º¸´Ù Å®´Ï´Ù\n"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c(ÀÌ)°¡ Á¾·áµÇÁö ¾ÊÀ½: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "'%%' ´ÙÀ½¿¡ ó¸®ÇÒ ¼ö ¾ø´Â(unparseable) ¸ÅÅ©·Î°¡ ÀÖ½À´Ï´Ù\n"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "¸ÅÅ©·Î %%%.*s¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr "¸ñÇ¥´ë»ó(Target) ¹öÆÛ ¿À¹öÇ÷οì\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "%s ÆÄÀÏ: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "%s ÆÄÀÏÀÌ %u ¹ÙÀÌÆ® º¸´Ù Àû½À´Ï´Ù\n"

diff --git a/po/no.po b/po/no.po
index 1e8cb6f..b2f298c 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1547,37 +1547,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s lagret som %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s rmdir av %s feilet: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s unlink av %s feilet: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s opprettet som %s\n"
@@ -2791,7 +2791,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
@@ -3139,93 +3139,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr "Overflyt i målbuffer\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Fil %s er mindre enn %u bytes\n"

diff --git a/po/pl.po b/po/pl.po
index 050f288..6bb7641 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1592,37 +1592,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "linia %d: %s"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "ostrze¿enie: %s zapisany jako %s"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "nie mo¿na usun±æ %s - katalog nie jest pusty"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "skasowanie katalogu %s nie powiod³o siê"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod³o siê\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "ostrze¿enie: %s utworzony jako %s"
@@ -2887,7 +2887,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominiêty z powodu flagi missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
@@ -3240,94 +3240,94 @@ msgstr "tworzenie katalogu: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktywny %d pusty %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(pusty)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(pusty)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s ma niezakoñczon± strukturê"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s ma niedozwolon± nazwê (%%define)"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s ma niezakoñczone opcje"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s nie zawiera ¿adnych poleceñ"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Rozwiniêcie makra %%%s nie powiod³o siê"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s ma niedozwolon± nazwê (%%undefine)"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nieznana opcja %c in %s(%s)"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Niezakoñczone %c: %s"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, fuzzy, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Napotkano nieprzetwarzalne makro po %%"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Nie znaleziono makra %%%.*s, makro pominiête"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "Przepe³nienie bufora docelowego"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "Plik %s: %s"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, fuzzy, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Plik %s jest mniejszy ni¿ %d bajtów"

diff --git a/po/pt.po b/po/pt.po
index 5c6aa4e..8bb8cdd 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -1563,39 +1563,39 @@ msgstr "========= Directorias n
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr "directoria %s criada com as permissões %04o.\n"
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 "o ficheiro de arquivo %s não foi encontrado na lista de ficheiros do "
 "cabeçalho\n"
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gravado como %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s rmdir de %s falhou: Directoria não está vazia\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s rmdir de %s falhou: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s unlink de %s falhou: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s criado como %s\n"
@@ -2823,7 +2823,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido à opção missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
@@ -3174,93 +3174,93 @@ msgstr "a remover a directoria %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "falhou a remoção da directoria %s: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== activo %d vazio %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vazio)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vazio)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "A macro %%%s tem o conteúdo incompleto\n"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "A macro %%%s tem um nome inválido (%%define)\n"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "A macro %%%s tem as opções incompletas\n"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "A macro %%%s tem o conteúdo em branco\n"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "A macro %%%s não conseguiu ser expandida\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "A macro %%%s tem um nome ilegal (%%undefine)\n"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "A macro %%%s (%s) não foi usada abaixo do nível %d\n"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opção desconhecida %c em %s(%s)\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Nível de recursividade(%d) maior que o máximo(%d)\n"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c não terminado: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Segue-se uma macro impossível de analisar ao %%\n"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "A macro %%%.*s não foi encontrada, por isso foi ignorada\n"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr "Sobrecarga do tampão de destino\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Ficheiro %s: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "O ficheiro %s tem menos de %u bytes\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 080fcc2..d03a068 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 
 #: build.c:40
 #, fuzzy
@@ -1706,40 +1706,40 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
 # , c-format
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "Construo falhou.\n"
 
 # , c-format
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -3045,7 +3045,7 @@ msgstr ""
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM verso %s\n"
@@ -3419,95 +3419,95 @@ msgstr "RPM verso %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
 # , c-format
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/ro.po b/po/ro.po
index 757d2c7..ce604cd 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -1524,37 +1524,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2743,7 +2743,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3091,93 +3091,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index 53e70d4..e02bae6 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1530,37 +1530,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2749,7 +2749,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3097,93 +3097,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 7002852..50798b8 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2002-04-09 16:44-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1570,37 +1570,37 @@ msgstr "========= 
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ÐÒÁ×ÁÍÉ ÄÏÓÔÕÐÁ %04o.\n"
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓÐÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n"
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: ËÁÔÁÌÏÇ ÎÅ ÐÕÓÔ\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n"
@@ -2821,7 +2821,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
@@ -3173,93 +3173,93 @@ msgstr "
 msgid "failed to remove directory %s: %s\n"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "====================== ÁËÔÉ×ÎÙÈ %d ÐÕÓÔÙÈ %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(ÐÕÓÔÏ)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(ÐÕÓÔÏ)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "îÅÚÁËÒÙÔÙÊ ÍÁËÒÏÓ %%%s\n"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%define) ÍÁËÒÏÓÁ %%%s\n"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "îÅÚÁËÒÙÔÙÅ ÐÁÒÁÍÅÔÒÙ × ÍÁËÒÏÓÅ %%%s\n"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "íÁËÒÏÓ %%%s ÐÕÓÔ\n"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ ÍÁËÒÏÓ %%%s\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%undefine) ÍÁËÒÏÓÁ %%%s\n"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d\n"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ %c × %s(%s)\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ ÄÏÐÕÓÔÉÍÏÊ(%d)\n"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "îÅÚÁËÒÙÔÁÑ %c: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "ÎÅÐÏÎÑÔÎÙÊ ÍÁËÒÏÓ ÐÏÓÌÅ %%\n"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "íÁËÒÏÓ %%%.*s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ\n"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "æÁÊÌ %s: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "äÌÉÎÁ ÆÁÊÌÁ %s ÍÅÎØÛÅ ÞÅÍ %u ÂÁÊÔ\n"

diff --git a/po/sk.po b/po/sk.po
index 2d47b76..538c94d 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1590,37 +1590,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "riadok %d: %s"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "varovanie: %s uchovaný ako %s"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "rmdir %s zlyhalo: %s"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "varovanie: %s vytvorené ako %s"
@@ -2883,7 +2883,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
@@ -3236,94 +3236,94 @@ msgstr "vytv
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktívnych %d prázdnych %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prázdne)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prázdne)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s obsahuje neukonèené telo"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s obsahuje chybný názov (%%define)"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s obsahuje neukonèené voµby"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s obsahuje prázdne telo"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s sa nepodarilo expandova»"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s obsahuje chybný názov (%%undefine)"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d "
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznáma voµba %c v %s(%s)"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Neukonèené %c: %s"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "balík %%%.*s nebol nájdený, vynecháva sa"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "Preplnenie cieµovej vyrovnávacej pamäti"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "Súbor %s: %s"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, fuzzy, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Súbor %s je men¹í ako %d bajtov"

diff --git a/po/sl.po b/po/sl.po
index ddfcc36..ce1fd13 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.260 2002/06/20 23:08:42 jbj Exp $
+# $Id: sl.po,v 1.261 2002/06/21 18:01:34 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1593,37 +1593,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "vrstica %d: %s"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "opozorilo: %s shranjen kot %s"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "ni mo¾no odstraniti %s - imenik ni prazen"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "odstranitev imenika %s je bila neuspe¹na: %s"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "opozorilo: %s ustvarjen kot %s"
@@ -2886,7 +2886,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izkljuèevanje imenika %s\n"
@@ -3243,94 +3243,94 @@ msgstr "odstranjevanje imenika: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivni %d prazni %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prazni)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prazni)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s vsebuje nezakljuèeno telo"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s vsebuje nezakljuèene izbire"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s vsebuje prazno telo"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s se ne raz¹iri"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznana izbira %c v %s(%s)"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Nezakljuèeni %c: %s"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, fuzzy, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Oznaki %% sledi nerazèlenljiv makro"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Makro %%%.*s ni najden - preskoèeno"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "Ciljni medpomnilnik je bil prekoraèen"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "Datoteka %s: %s"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, fuzzy, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Datoteka %s je kraj¹a od %d bajtov"

diff --git a/po/sr.po b/po/sr.po
index fc08449..1496a94 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -1578,37 +1578,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, fuzzy, c-format
 msgid "%s saved as %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "ne mogu da uklonim %s - direktorijum nije prazan"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, fuzzy, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "neuspela komanda rmdir %s: %s"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, fuzzy, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, fuzzy, c-format
 msgid "%s created as %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -2878,7 +2878,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
@@ -3231,93 +3231,93 @@ msgstr "gre
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "(nepoznat tip)"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "paket %s nije naðen u %s"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/sv.po b/po/sv.po
index 5a9b26f..c45c6fd 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2002-02-18 21:13+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1555,37 +1555,37 @@ msgstr "========= Kataloger ej uttryckligen inkluderade i paketet:\n"
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr "katalog %s skapad med rättigheter %04o.\n"
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr "arkivfil %s fanns inte i huvudets fillista\n"
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s sparades som %s\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s rmdir av %s misslyckades: Katalogen är inte tom\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s rmdir av %s misslyckades: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s unlink av %s misslyckades: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s skapades som %s\n"
@@ -2805,7 +2805,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad på grund av missingok-flagga\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
@@ -3153,93 +3153,93 @@ msgstr "tar bort katalog %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiva %d tomma %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s har oavslutad kropp\n"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s har otillåtet namn (%%define)\n"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s har oavslutade flaggor\n"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "makro %%%s har tom kropp\n"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s misslyckades att expandera\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s har otillåtet namn (%%undefine)\n"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) användes inte under nivå %d\n"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Okänd flagga %c i %s(%s)\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Rekursionsdjup(%d) större än max(%d)\n"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Oavslutad %c: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Ett %% följs av ett makro som inte kan tolkas\n"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Inget makro %%%.*s hittat, hoppar över\n"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr "Målbuffert översvämmad\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Filen %s är mindre än %u byte\n"

diff --git a/po/tr.po b/po/tr.po
index 13cfb7d..2958273 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1578,37 +1578,37 @@ msgstr "========= Pakette bulunmayan dizinler:\n"
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr "%s dizin %04o izinleriyle oluþturuldu.\n"
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s %s olarak kaydedildi\n"
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr "%s / %s dizin silinemedi - Dizin boþ deðil\n"
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr "%s / %s dizinin silinmesi baþarýsýz: %s\n"
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr "%s / %s bað kaldýrýlamadý: %s\n"
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s %s olarak oluþturuldu\n"
@@ -2836,7 +2836,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamasýndan dolayý %s atlandý\n"
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini dýþlanýyor\n"
@@ -3186,93 +3186,93 @@ msgstr "%s dizini siliniyor\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s dizininin silinmesi baþarýsýz: %s\n"
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d etkin %d boþ\n"
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(boþ)"
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(boþ)\n"
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "%%%s makrosunun gövdesi sonlandýrýlmamýþ\n"
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n"
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "%%%s makrosunu seçenekleri sonlandýrýlmamýþ\n"
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "%%%s makrosu boþ\n"
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "%%%s makrosu geniþletmede baþarýsýz\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n"
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "%%%s (%s) makrosu %d seviyenin altýnda kullanýlmadý\n"
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%c seçeneði %s(%s) de anlaþýlamadý\n"
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Yineleme derinliði(%d) mümkün miktardan(%d) büyük\n"
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c sonlandýrýlmamýþ: %s\n"
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Bir ayrýþtýrýlamayan makro tarafýndan bir %% izlendi\n"
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "%%%.*s makrosu bulunamadý, atlanýyor\n"
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr "Hedef tampon bellek taþtý\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr "%s dosyasý: %s\n"
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "%s dosyasý %u bayttan küçük\n"

diff --git a/po/uk.po b/po/uk.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/wa.po b/po/wa.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/zh.po b/po/zh.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 64760b0..59f72ea 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-06-20 18:00-0400\n"
+"POT-Creation-Date: 2002-06-21 13:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1529,37 +1529,37 @@ msgstr ""
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1198
+#: lib/fsm.c:1199
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1489
+#: lib/fsm.c:1490
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1612 lib/fsm.c:1738
+#: lib/fsm.c:1613 lib/fsm.c:1739
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1764
+#: lib/fsm.c:1765
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1770
+#: lib/fsm.c:1771
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1780
+#: lib/fsm.c:1781
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1800
+#: lib/fsm.c:1801
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2748,7 +2748,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:895
+#: lib/transaction.c:894
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3096,93 +3096,93 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:225
+#: rpmio/macro.c:227
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:354
+#: rpmio/macro.c:360
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:397
+#: rpmio/macro.c:403
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:632
+#: rpmio/macro.c:631
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:661
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:667
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:672
+#: rpmio/macro.c:671
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:678
+#: rpmio/macro.c:677
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:712
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:831
+#: rpmio/macro.c:826
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:951
+#: rpmio/macro.c:946
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1154
+#: rpmio/macro.c:1141
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1224 rpmio/macro.c:1241
+#: rpmio/macro.c:1211 rpmio/macro.c:1228
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1282
+#: rpmio/macro.c:1269
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1411
+#: rpmio/macro.c:1398
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1488
+#: rpmio/macro.c:1469
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1687 rpmio/macro.c:1693
+#: rpmio/macro.c:1664 rpmio/macro.c:1670
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1696
+#: rpmio/macro.c:1673
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""

diff --git a/rpm.spec.in b/rpm.spec.in
index 8505a3d..491c974 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -190,9 +190,6 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
 install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm
 
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
-cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.db1
-%%_dbapi               1
-E_O_F
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
 for dbi in \
@@ -238,12 +235,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 %ifos linux
-if [ -f /var/lib/rpm/Packages -a -f /var/lib/rpm/packages.rpm ]; then
+if [ -f /var/lib/rpm/packages.rpm ]; then
     echo "
-You have both
+You have (unsupported)
        /var/lib/rpm/packages.rpm       db1 format installed package headers
-       /var/lib/rpm/Packages           db3 format installed package headers
-Please remove (or at least rename) one of those files, and re-install.
+Please install rpm-4.0.4 first, and do
+       rpm --rebuilddb
+to convert your database from db1 to db3 format.
 "
     exit 1
 fi
@@ -255,17 +253,8 @@ exit 0
 %post
 %ifos linux
 /sbin/ldconfig
-if [ -f /var/lib/rpm/packages.rpm ]; then
-    /bin/chown @RPMUSER@.@RPMGROUP@ /var/lib/rpm/*.rpm
-elif [ -f /var/lib/rpm/Packages ]; then
-    # undo db1 configuration
-    rm -f /etc/rpm/macros.db1
-    /bin/chown @RPMUSER@.@RPMGROUP@ /var/lib/rpm/[A-Z]*
-else
-    # initialize db3 database
-    rm -f /etc/rpm/macros.db1
-    /bin/rpm --initdb
-fi
+/bin/rpm --initdb
+/bin/chown @RPMUSER@.@RPMGROUP@ /var/lib/rpm/[A-Z]*
 %endif
 exit 0
 
@@ -522,6 +511,10 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Fri Jun 21 2002 Jeff Johnson <jbj@redhat.com>
+- fix: reading macro files can corrupt memory if BUFSIZ is teensy.
+- fix: assertion failure iff incomplete package install (#66837).
+
 * Thu Jun 20 2002 Jeff Johnson <jbj@redhat.com>
 - add translated man pages from PLD.
 - resurrect libelf with Elf64, prelink verify should work everywhere.

diff --git a/rpmio/macro.c b/rpmio/macro.c
index b7d8d9c..7532cbe 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -67,14 +67,18 @@ MacroContext rpmCLIMacroContext = &rpmCLIMacroContext_s;
  * Macro expansion state.
  */
 typedef /*@abstract@*/ struct MacroBuf_s {
-/*@shared@*/ const char * s;   /*!< Text to expand. */
-/*@shared@*/ char * t;         /*!< Expansion buffer. */
+/*@kept@*/ /*@exposed@*/
+    const char * s;            /*!< Text to expand. */
+/*@shared@*/
+    char * t;                  /*!< Expansion buffer. */
     size_t nb;                 /*!< No. bytes remaining in expansion buffer. */
     int depth;                 /*!< Current expansion depth. */
     int macro_trace;           /*!< Pre-print macro to expand? */
     int expand_trace;          /*!< Post-print macro expansion? */
-/*@shared@*/ /*@null@*/ void * spec;   /*!< (future) %file expansion info?. */
-/*@dependent@*/ MacroContext mc;
+/*@kept@*/ /*@exposed@*/ /*@null@*/
+    void * spec;               /*!< (future) %file expansion info?. */
+/*@kept@*/ /*@exposed@*/
+    MacroContext mc;
 } * MacroBuf;
 
 #define SAVECHAR(_mb, _c) { *(_mb)->t = (_c), (_mb)->t++, (_mb)->nb--; }
@@ -103,11 +107,9 @@ int print_expand_trace = 0;
 /* forward ref */
 static int expandMacro(MacroBuf mb)
        /*@globals rpmGlobalMacroContext,
-               print_macro_trace, print_expand_trace,
-               fileSystem @*/
+               print_macro_trace, print_expand_trace, fileSystem @*/
        /*@modifies mb, rpmGlobalMacroContext,
-               print_macro_trace, print_expand_trace,
-               fileSystem @*/;
+               print_macro_trace, print_expand_trace, fileSystem @*/;
 
 /**
  * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
@@ -233,17 +235,18 @@ rpmDumpMacroTable(MacroContext mc, FILE * fp)
  * @param namelen      no. of byes
  * @return             address of slot in macro table with name (or NULL)
  */
-/*@-mustmod@*/ /* LCL: segfault with modifies nothing annotation */
-/*@dependent@*/ /*@null@*/ static MacroEntry *
+/*@dependent@*/ /*@null@*/
+static MacroEntry *
 findEntry(MacroContext mc, const char * name, size_t namelen)
-       /*@globals rpmGlobalMacroContext @*/
-       /*@modifies rpmGlobalMacroContext @*/
+       /*@*/
 {
     MacroEntry key, *ret;
     struct MacroEntry_s keybuf;
     char namebuf[1024];
 
+/*@-globs@*/
     if (mc == NULL) mc = rpmGlobalMacroContext;
+/*@=globs@*/
     if (mc->macroTable == NULL || mc->firstFree == 0)
        return NULL;
 
@@ -265,31 +268,35 @@ findEntry(MacroContext mc, const char * name, size_t namelen)
     /* XXX TODO: find 1st empty slot and return that */
     return ret;
 }
-/*@=mustmod@*/
 
 /* =============================================================== */
 
 /**
  * fgets(3) analogue that reads \ continuations. Last newline always trimmed.
+ * @param buf          input buffer
+ * @param size         inbut buffer size (bytes)
+ * @param fd           file handle
+ * @param escapes      permit escaped newlines?
+ * @return             buffer, or NULL on end-of-file
  */
-/*@dependent@*/ static char *
-rdcl(char * buf, size_t size, FD_t fd, int escapes)
+/*@null@*/
+static char *
+rdcl(/*@returned@*/ char * buf, size_t size, FD_t fd, int escapes)
        /*@globals fileSystem @*/
        /*@modifies buf, fileSystem @*/
 {
-    char *q = buf;
+    char *q = buf - 1;         /* initialize just before buffer. */
     size_t nb = 0;
     size_t nread = 0;
     FILE * f = fdGetFILE(fd);
 
-    *q = '\0';
     if (f != NULL)
     do {
-       /* read next line */
-       if (fgets(q, size, f) == NULL)
+       *(++q) = '\0';                  /* terminate and move forward. */
+       if (fgets(q, size, f) == NULL)  /* read next line. */
            break;
        nb = strlen(q);
-       nread += nb;
+       nread += nb;                    /* trim trailing \r and \n */
        for (q += nb - 1; nb > 0 && iseol(*q); q--)
            nb--;
        if (!(nb > 0 && *q == '\\')) {  /* continue? */
@@ -303,9 +310,8 @@ rdcl(char * buf, size_t size, FD_t fd, int escapes)
        size -= nb;
        if (*q == '\r')                 /* XXX avoid \r madness */
            *q = '\n';
-       *(++q) = '\0';                  /* next char in buf */
     } while (size > 0);
-    /*@-retalias@*/ return (nread > 0 ? buf : NULL); /*@=retalias@*/
+    return (nread > 0 ? buf : NULL);
 }
 
 /**
@@ -424,12 +430,16 @@ printExpansion(MacroBuf mb, const char * t, const char * te)
 }
 
 #define        SKIPBLANK(_s, _c)       \
+       /*@-globs@*/    /* FIX: __ctype_b */ \
        while (((_c) = *(_s)) && isblank(_c)) \
-               (_s)++;
+               (_s)++;         \
+       /*@=globs@*/
 
 #define        SKIPNONBLANK(_s, _c)    \
+       /*@-globs@*/    /* FIX: __ctype_b */ \
        while (((_c) = *(_s)) && !(isblank(_c) || iseol(_c))) \
-               (_s)++;
+               (_s)++;         \
+       /*@=globs@*/
 
 #define        COPYNAME(_ne, _s, _c)   \
     {  SKIPBLANK(_s,_c);       \
@@ -462,8 +472,7 @@ printExpansion(MacroBuf mb, const char * t, const char * te)
  */
 static int
 expandT(MacroBuf mb, const char * f, size_t flen)
-       /*@globals rpmGlobalMacroContext,
-               fileSystem@*/
+       /*@globals rpmGlobalMacroContext, fileSystem@*/
        /*@modifies mb, rpmGlobalMacroContext, fileSystem @*/
 {
     char *sbuf;
@@ -491,8 +500,7 @@ expandT(MacroBuf mb, const char * f, size_t flen)
  */
 static int
 expandS(MacroBuf mb, char * tbuf, size_t tbuflen)
-       /*@globals rpmGlobalMacroContext,
-               fileSystem@*/
+       /*@globals rpmGlobalMacroContext, fileSystem@*/
        /*@modifies mb, *tbuf, rpmGlobalMacroContext, fileSystem @*/
 {
     const char *t = mb->t;
@@ -517,8 +525,7 @@ expandS(MacroBuf mb, char * tbuf, size_t tbuflen)
  */
 static int
 expandU(MacroBuf mb, char * u, size_t ulen)
-       /*@globals rpmGlobalMacroContext,
-               fileSystem@*/
+       /*@globals rpmGlobalMacroContext, fileSystem@*/
        /*@modifies mb, *u, rpmGlobalMacroContext, fileSystem @*/
 {
     const char *s = mb->s;
@@ -530,9 +537,7 @@ expandU(MacroBuf mb, char * u, size_t ulen)
     tbuf = alloca(ulen + 1);
     memset(tbuf, 0, (ulen + 1));
 
-    /*@-temptrans -assignexpose@*/
     mb->s = u;
-    /*@=temptrans =assignexpose@*/
     mb->t = tbuf;
     mb->nb = ulen;
     rc = expandMacro(mb);
@@ -557,10 +562,8 @@ expandU(MacroBuf mb, char * u, size_t ulen)
  */
 static int
 doShellEscape(MacroBuf mb, const char * cmd, size_t clen)
-       /*@globals rpmGlobalMacroContext,
-               fileSystem @*/
-       /*@modifies mb, rpmGlobalMacroContext,
-               fileSystem @*/
+       /*@globals rpmGlobalMacroContext, fileSystem @*/
+       /*@modifies mb, rpmGlobalMacroContext, fileSystem @*/
 {
     char pcmd[BUFSIZ];
     FILE *shf;
@@ -596,7 +599,7 @@ doShellEscape(MacroBuf mb, const char * cmd, size_t clen)
  * @return             address to continue parsing
  */
 /*@dependent@*/ static const char *
-doDefine(MacroBuf mb, const char * se, int level, int expandbody)
+doDefine(MacroBuf mb, /*@returned@*/ const char * se, int level, int expandbody)
        /*@globals rpmGlobalMacroContext @*/
        /*@modifies mb, rpmGlobalMacroContext @*/
 {
@@ -608,9 +611,7 @@ doDefine(MacroBuf mb, const char * se, int level, int expandbody)
     int oc = ')';
 
     /* Copy name */
-/*@-globs@*/
     COPYNAME(ne, s, c);
-/*@=globs@*/
 
     /* Copy opts (if present) */
     oe = ne + 1;
@@ -623,15 +624,13 @@ doDefine(MacroBuf mb, const char * se, int level, int expandbody)
 
     /* Copy body, skipping over escaped newlines */
     b = be = oe + 1;
-/*@-globs@*/
     SKIPBLANK(s, c);
-/*@=globs@*/
     if (c == '{') {    /* XXX permit silent {...} grouping */
        if ((se = matchchar(s, c, '}')) == NULL) {
            rpmError(RPMERR_BADSPEC,
                _("Macro %%%s has unterminated body\n"), n);
            se = s;     /* XXX W2DO? */
-           /*@-retalias@*/ return se; /*@=retalias@*/
+           return se;
        }
        s++;    /* XXX skip { */
        strncpy(b, s, (se - s));
@@ -659,30 +658,30 @@ doDefine(MacroBuf mb, const char * se, int level, int expandbody)
     if (!((c = *n) && (xisalpha(c) || c == '_') && (ne - n) > 2)) {
        rpmError(RPMERR_BADSPEC,
                _("Macro %%%s has illegal name (%%define)\n"), n);
-       /*@-retalias@*/ return se; /*@=retalias@*/
+       return se;
     }
 
     /* Options must be terminated with ')' */
     if (o && oc != ')') {
        rpmError(RPMERR_BADSPEC, _("Macro %%%s has unterminated opts\n"), n);
-       /*@-retalias@*/ return se; /*@=retalias@*/
+       return se;
     }
 
     if ((be - b) < 1) {
        rpmError(RPMERR_BADSPEC, _("Macro %%%s has empty body\n"), n);
-       /*@-retalias@*/ return se; /*@=retalias@*/
+       return se;
     }
 
 /*@-modfilesys@*/
     if (expandbody && expandU(mb, b, (&buf[sizeof(buf)] - b))) {
        rpmError(RPMERR_BADSPEC, _("Macro %%%s failed to expand\n"), n);
-       /*@-retalias@*/ return se; /*@=retalias@*/
+       return se;
     }
 /*@=modfilesys@*/
 
     addMacro(mb->mc, n, o, b, (level - 1));
 
-    /*@-retalias@*/ return se; /*@=retalias@*/
+    return se;
 }
 
 /**
@@ -692,7 +691,7 @@ doDefine(MacroBuf mb, const char * se, int level, int expandbody)
  * @return             address to continue parsing
  */
 /*@dependent@*/ static const char *
-doUndefine(MacroContext mc, const char * se)
+doUndefine(MacroContext mc, /*@returned@*/ const char * se)
        /*@globals rpmGlobalMacroContext @*/
        /*@modifies mc, rpmGlobalMacroContext @*/
 {
@@ -700,9 +699,7 @@ doUndefine(MacroContext mc, const char * se)
     char buf[BUFSIZ], *n = buf, *ne = n;
     int c;
 
-/*@-globs@*/
     COPYNAME(ne, s, c);
-/*@=globs@*/
 
     /* Move scan over body */
     while (iseol(*s))
@@ -713,12 +710,12 @@ doUndefine(MacroContext mc, const char * se)
     if (!((c = *n) && (xisalpha(c) || c == '_') && (ne - n) > 2)) {
        rpmError(RPMERR_BADSPEC,
                _("Macro %%%s has illegal name (%%undefine)\n"), n);
-       /*@-retalias@*/ return se; /*@=retalias@*/
+       return se;
     }
 
     delMacro(mc, n);
 
-    /*@-retalias@*/ return se; /*@=retalias@*/
+    return se;
 }
 
 #ifdef DYING
@@ -751,9 +748,7 @@ pushMacro(/*@out@*/ MacroEntry * mep,
                /*@null@*/ const char * b, int level)
        /*@modifies *mep @*/
 {
-    /*@-usedef@*/
     MacroEntry prev = (mep && *mep ? *mep : NULL);
-    /*@=usedef@*/
     MacroEntry me = (MacroEntry) xmalloc(sizeof(*me));
 
     /*@-assignexpose@*/
@@ -852,7 +847,7 @@ freeArgs(MacroBuf mb)
  * @return             address to continue parsing
  */
 /*@dependent@*/ static const char *
-grabArgs(MacroBuf mb, const MacroEntry me, const char * se, char lastc)
+grabArgs(MacroBuf mb, const MacroEntry me, /*@returned@*/ const char * se, char lastc)
        /*@globals rpmGlobalMacroContext @*/
        /*@modifies mb, rpmGlobalMacroContext @*/
 {
@@ -950,13 +945,11 @@ grabArgs(MacroBuf mb, const MacroEntry me, const char * se, char lastc)
        if (c == '?' || (o = strchr(opts, c)) == NULL) {
            rpmError(RPMERR_BADSPEC, _("Unknown option %c in %s(%s)\n"),
                        (char)c, me->name, opts);
-           /*@-retalias@*/ return se; /*@=retalias@*/
+           return se;
        }
        *be++ = '-';
        *be++ = c;
-       /*@-usedef@*/
        if (o[1] == ':') {
-       /*@=usedef@*/
            *be++ = ' ';
            be = stpcpy(be, optarg);
        }
@@ -988,7 +981,7 @@ grabArgs(MacroBuf mb, const MacroEntry me, const char * se, char lastc)
     /* Add unexpanded args as macro. */
     addMacro(mb->mc, "*", NULL, b, mb->depth);
 
-    /*@-retalias@*/ return se; /*@=retalias@*/
+    return se;
 }
 
 /**
@@ -1000,10 +993,8 @@ grabArgs(MacroBuf mb, const MacroEntry me, const char * se, char lastc)
  */
 static void
 doOutput(MacroBuf mb, int waserror, const char * msg, size_t msglen)
-       /*@globals rpmGlobalMacroContext,
-               fileSystem @*/
-       /*@modifies mb, rpmGlobalMacroContext,
-               fileSystem @*/
+       /*@globals rpmGlobalMacroContext, fileSystem @*/
+       /*@modifies mb, rpmGlobalMacroContext, fileSystem @*/
 {
     char buf[BUFSIZ];
 
@@ -1028,10 +1019,8 @@ doOutput(MacroBuf mb, int waserror, const char * msg, size_t msglen)
 static void
 doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
                const char * g, size_t gn)
-       /*@globals rpmGlobalMacroContext,
-               fileSystem, internalState @*/
-       /*@modifies mb, rpmGlobalMacroContext,
-               fileSystem, internalState @*/
+       /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+       /*@modifies mb, rpmGlobalMacroContext, fileSystem, internalState @*/
 {
     char buf[BUFSIZ], *b = NULL, *be;
     int c;
@@ -1130,11 +1119,9 @@ doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
 static int
 expandMacro(MacroBuf mb)
        /*@globals rpmGlobalMacroContext,
-               print_macro_trace, print_expand_trace,
-               fileSystem @*/
+               print_macro_trace, print_expand_trace, fileSystem @*/
        /*@modifies mb, rpmGlobalMacroContext,
-               print_macro_trace, print_expand_trace,
-               fileSystem @*/
+               print_macro_trace, print_expand_trace, fileSystem @*/
 {
     MacroEntry *mep;
     MacroEntry me;
@@ -1428,9 +1415,7 @@ expandMacro(MacroBuf mb)
 
        /* Recursively expand body of macro */
        if (me->body && *me->body) {
-               /*@-onlytrans@*/
                mb->s = me->body;
-               /*@=onlytrans@*/
                rc = expandMacro(mb);
                if (rc == 0)
                        me->used++;     /* Mark macro as used */
@@ -1468,19 +1453,15 @@ expandMacros(void * spec, MacroContext mc, char * sbuf, size_t slen)
     tbuf = alloca(slen + 1);
     memset(tbuf, 0, (slen + 1));
 
-    /*@-temptrans -assignexpose@*/
     mb->s = sbuf;
-    /*@=temptrans =assignexpose@*/
     mb->t = tbuf;
     mb->nb = slen;
     mb->depth = 0;
     mb->macro_trace = print_macro_trace;
     mb->expand_trace = print_expand_trace;
 
-    /*@-temptrans -assignexpose@*/
     mb->spec = spec;   /* (future) %file expansion info */
     mb->mc = mc;
-    /*@=temptrans =assignexpose@*/
 
     rc = expandMacro(mb);
 
@@ -1542,9 +1523,7 @@ rpmDefineMacro(MacroContext mc, const char * macro, int level)
 
     memset(mb, 0, sizeof(*mb));
     /* XXX just enough to get by */
-    /*@-temptrans -assignexpose@*/
     mb->mc = (mc ? mc : rpmGlobalMacroContext);
-    /*@=temptrans =assignexpose@*/
     (void) doDefine(mb, macro, level, 0);
     return 0;
 }
@@ -1624,9 +1603,7 @@ rpmInitMacros(/*@unused@*/ MacroContext mc, const char *macrofiles)
            char c, *n;
 
            n = buf;
-/*@-globs@*/
            SKIPBLANK(n, c);
-/*@=globs@*/
 
            if (c != '%')
                /*@innercontinue@*/ continue;
@@ -1856,7 +1833,7 @@ char *rpmCleanPath(char * path)
     *t = '\0';
 
 /*fprintf(stderr, "\t%s\n", path); */
-    /*@-temptrans -retalias@*/ return path; /*@=temptrans =retalias@*/
+    return path;
 }
 
 /* Return concatenated and expanded canonical path. */

diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 70eef42..bb028c4 100644 (file)
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -229,10 +229,8 @@ struct FDIO_s {
 /**
  * strerror(3) clone.
  */
-/*@-redecl@*/
 /*@observer@*/ const char * Fstrerror(/*@null@*/ FD_t fd)
        /*@*/;
-/*@=redecl@*/
 
 /**
  * fread(3) clone.

diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
index aa59ad4..020a954 100644 (file)
--- a/rpmio/rpmmacro.h
+++ b/rpmio/rpmmacro.h
@@ -180,7 +180,8 @@ char * rpmExpand    (/*@null@*/ const char * arg, ...)
  * @param path         path to canonicalize (in-place)
  * @return             canonicalized path (malloc'ed)
  */
-/*@null@*/ char * rpmCleanPath (/*@null@*/ char * path)
+/*@null@*/
+char * rpmCleanPath    (/*@returned@*/ /*@null@*/ char * path)
        /*@modifies *path @*/;
 
 /**