- uname on i370 has s390 as arch (#11456).

CVS patchset: 3888
CVS date: 2000/06/21 23:48:05

diff --git a/CHANGES b/CHANGES
index 94ab32d..6b6b9ab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -81,6 +81,7 @@
        - update macros.in from rpm-4.0 (w/o dbi configuration).
        - fix: don't expand macros in false branch of %if (kasal@suse.cz).
        - fix: macro expansion problem and clean up (#11484) (kasal@suse.cz).
+       - uname on i370 has s390 as arch (#11456).
 
 3.0.3 -> 3.0.4
        - use compressed filenames on install side.

diff --git a/po/cs.po b/po/cs.po
index 5d56e17..0b678f1 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -1265,11 +1265,6 @@ msgstr "nelze otev
 msgid "Usage: %s {--help}\n"
 msgstr "pou¾ití: rpm {--help}"
 
-#: rpmqv.c:284
-#, fuzzy, c-format
-msgid "       %s {--version}\n"
-msgstr "       rpm {--version}"
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1287,34 +1282,17 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:302
-#, fuzzy, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-"       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]"
 
-#: rpmqv.c:318
-#, fuzzy, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpmqv.c:328
-#, fuzzy, c-format
-msgid "       %s {--querytags}\n"
-msgstr "       rpm {--querytags}"
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1334,12 +1312,6 @@ msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
 "<soubor>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-"                        [--sign] [--test] [--timecheck <s>] [--buildos <os>]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2173,7 +2145,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "nelze otevøít %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2328,46 +2300,46 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "soubor %s: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "nelze otevøít %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "neovìøovat architekturu balíèku"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "balíèek %s není uveden v %s"
@@ -3489,11 +3461,6 @@ msgstr "odstra
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraòuje se rejstøík názvù\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3514,6 +3481,11 @@ msgstr "Prob
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4100,41 +4072,41 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Neznámý systém: %s\n"
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "balíèek %s nenalezen v %s"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "soubor %s: %s\n"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -4197,6 +4169,29 @@ msgid "failed to create %s: %s\n"
 msgstr "%s nelze vytvoøit\n"
 
 #, fuzzy
+#~ msgid "       %s {--version}\n"
+#~ msgstr "       rpm {--version}"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
+#~ msgstr ""
+#~ "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
+
+#, fuzzy
+#~ msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
+#~ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
+
+#, fuzzy
+#~ msgid "       %s {--querytags}\n"
+#~ msgstr "       rpm {--querytags}"
+
+#, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr ""
+#~ "                        [--sign] [--test] [--timecheck <s>] [--buildos <os>]"
+
+#, fuzzy
 #~ msgid "query package owning file"
 #~ msgstr "dotazy na balíèek vlastnící <soubor>"
 

diff --git a/po/de.po b/po/de.po
index c4484c8..7a51e86 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1331,11 +1331,6 @@ msgstr "kann Datei %s nicht 
 msgid "Usage: %s {--help}\n"
 msgstr "Benutzung: rpm {--help}"
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1352,33 +1347,17 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1398,12 +1377,6 @@ msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<DATEI>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-"                        [--sign] [--test] [--timecheck <S>] [--buildos <BS>]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2259,7 +2232,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2418,47 +2391,47 @@ msgid "line %d: Second %s"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -3599,11 +3572,6 @@ msgstr "Fehler beim L
 msgid "removing %d entries from %s index:\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3624,6 +3592,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4224,42 +4197,42 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -4323,6 +4296,11 @@ msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 #, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr ""
+#~ "                        [--sign] [--test] [--timecheck <S>] [--buildos <BS>]"
+
+#, fuzzy
 #~ msgid "query package owning file"
 #~ msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 

diff --git a/po/es.po b/po/es.po
index 09e52d3..16151e4 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index 1ec224a..9567193 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1300,11 +1300,6 @@ msgstr "en voinut avata tiedostoa %s: "
 msgid "Usage: %s {--help}\n"
 msgstr "käyttö: rpm {--help}"
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1321,34 +1316,18 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1368,12 +1347,6 @@ msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<tiedosto>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-"                        [--sign] [--test] [--timecheck <s>] [--buildos <kj>]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2208,7 +2181,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2363,46 +2336,46 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "en voinut avata %s: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "paketti %s ei ole %s:ssä"
@@ -3524,11 +3497,6 @@ msgstr "virhe poistettaessa tietuetta %s %s:st
 msgid "removing %d entries from %s index:\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3549,6 +3517,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4141,41 +4114,41 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -4238,6 +4211,11 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr ""
+#~ "                        [--sign] [--test] [--timecheck <s>] [--buildos <kj>]"
+
+#, fuzzy
 #~ msgid "query package owning file"
 #~ msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 

diff --git a/po/fr.po b/po/fr.po
index 3a8f4ad..1fcf3e6 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-06-20 14:36-0400\n"
+msgstr "POT-Creation-Date: 2000-06-21 19:14-0400\n"
 
 #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:425
 #, c-format
@@ -1307,11 +1307,6 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1328,32 +1323,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1371,11 +1350,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr "                          qui matchent <pkg>"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2193,7 +2167,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2348,46 +2322,46 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "%s ne peut être construit sur cette architecture\n"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
@@ -3509,11 +3483,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3534,6 +3503,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4109,41 +4083,41 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -4205,6 +4179,10 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr "                          qui matchent <pkg>"
+
+#, fuzzy
 #~ msgid "query package owning file"
 #~ msgstr ""
 #~ "        -f <file>+        - interroge le package à qui appartient <file>"

diff --git a/po/gl.po b/po/gl.po
index 09e52d3..16151e4 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 09e52d3..16151e4 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/id.po b/po/id.po
index 09e52d3..16151e4 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index e4f78c1..bec62f0 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.0\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "PO-Revision-Date: 2000-06-16 02:20+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1160,11 +1160,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1181,32 +1176,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1224,10 +1203,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -1995,7 +1970,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2150,45 +2125,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3269,11 +3244,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3294,6 +3264,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3862,40 +3837,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/it.po b/po/it.po
index 09e52d3..16151e4 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 2fb3cd3..69a01e6 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -127,7 +127,7 @@ msgstr "copyright 
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.79 2000/06/20 21:45:51 jbj Exp $
+# $Id: ja.po,v 1.80 2000/06/21 23:48:06 jbj Exp $
 #: rpm.c:177 rpmqv.c:256
 #, c-format
 msgid "rpm: %s\n"
@@ -1261,11 +1261,6 @@ msgstr "
 msgid "Usage: %s {--help}\n"
 msgstr "»ÈÍÑË¡: rpm {--help}"
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1282,32 +1277,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1325,10 +1304,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2135,7 +2110,7 @@ msgstr "%d 
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "%d ¹ÔÌÜ: %s Ãæ¤ËÉÔÀµ¤Êʸ»ú '-' : %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "%d ¹ÔÌÜ: BuildRoot ¤Ï \"/\" ¤Ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó: %s"
@@ -2291,47 +2266,47 @@ msgstr "%d 
 msgid "line %d: Second %s"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%s"
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr "%d ¹ÔÌÜ: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr "%%if ¤¬ÊĤ¸¤Æ¤¤¤Þ¤»¤ó"
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s%d: parseExpressionBoolean ¤¬ %d ¤òÊÖ¤·¤Þ¤·¤¿"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 #, fuzzy
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: if ¤¬¤Ê¤¤¤Î¤Ë %%else ¤¬¤¢¤ê¤Þ¤¹"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 #, fuzzy
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: if ¤¬¤Ê¤¤¤Î¤Ë %%endif ¤¬¤¢¤ê¤Þ¤¹"
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr "¤ª¤«¤·¤Ê %%include ¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ç¤¹"
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr "ºîÀ®(build)²Äǽ¤Ê¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï %%description ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
 
@@ -3466,11 +3441,6 @@ msgstr "group 
 msgid "removing %d entries from %s index:\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3491,6 +3461,11 @@ msgstr "%s 
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4087,41 +4062,41 @@ msgstr "
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)"
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礭¤¤"
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, fuzzy, c-format
 msgid "Unterminated %c: %s"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s"
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ­¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡¢¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥Õ¥í¡¼"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹"

diff --git a/po/ko.po b/po/ko.po
index 09e52d3..16151e4 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/no.po b/po/no.po
index 09e52d3..16151e4 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index 9b8b9cd..e8972d1 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1243,11 +1243,6 @@ msgstr "nie mo
 msgid "Usage: %s {--help}\n"
 msgstr "U¿ycie: rpm {--help}"
 
-#: rpmqv.c:284
-#, fuzzy, c-format
-msgid "       %s {--version}\n"
-msgstr "       rpm {--version}"
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1265,35 +1260,18 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:302
-#, fuzzy, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-"       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
-#: rpmqv.c:318
-#, fuzzy, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpmqv.c:328
-#, fuzzy, c-format
-msgid "       %s {--querytags}\n"
-msgstr "       rpm {--querytags}"
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1312,11 +1290,6 @@ msgid ""
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile <plik>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2149,7 +2122,7 @@ msgstr "linia %d: Pusta etykieta: %s"
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "linia %d: Nielegalny znak '-' w %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "linia %d: wpis BuildRoot nie mo¿e byæ \"/\": %s"
@@ -2305,45 +2278,45 @@ msgstr "linia %d: skrypt (tu jako program) musi si
 msgid "line %d: Second %s"
 msgstr "linia %d: Drugi %s"
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr "linia %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ: %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr "Niedomkniête %%if"
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: Napotkano %%else bez if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: Napotkano %%endif bez if"
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr "b³ednie sformatowany wpis %%include"
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr "Nie mo¿na budowaæ na takie architektury"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr "Pakiet nie ma %%description: %s"
 
@@ -3446,11 +3419,6 @@ msgstr "usuwanie indeksu grupy\n"
 msgid "removing %d entries from %s index:\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3471,6 +3439,11 @@ msgstr "zmiana nazwy %s na %s\n"
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4046,40 +4019,40 @@ msgstr "Makro %%%s ma niedozwolon
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d"
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Nieznana opcja %c in %s(%s)"
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)"
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Niezakoñczone %c: %s"
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr "Napotkano nieprzetwarzalne makro po %%"
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Nie znaleziono makra %%%.*s, makro pominiête"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr "Przepe³nienie bufora docelowego"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr "Plik %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr "Plik %s jest mniejszy ni¿ %d bajtów"
@@ -4140,6 +4113,28 @@ msgstr "port musi by
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
 
+#, fuzzy
+#~ msgid "       %s {--version}\n"
+#~ msgstr "       rpm {--version}"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
+#~ msgstr ""
+#~ "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
+
+#, fuzzy
+#~ msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
+#~ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
+
+#, fuzzy
+#~ msgid "       %s {--querytags}\n"
+#~ msgstr "       rpm {--querytags}"
+
+#, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
+
 #~ msgid "query package owning file"
 #~ msgstr "sprawdzanie do jakiego pakietu nale¿y plik"
 

diff --git a/po/pt.po b/po/pt.po
index 09e52d3..16151e4 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 29c8687..636523f 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-06-20 14:36-0400\n"
+msgstr "POT-Creation-Date: 2000-06-21 19:14-0400\n"
 
 #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:425
 #, c-format
@@ -1328,11 +1328,6 @@ msgstr "N
 msgid "Usage: %s {--help}\n"
 msgstr "uso: rpm {--help}"
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1349,12 +1344,6 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
@@ -1362,22 +1351,12 @@ msgstr ""
 "       rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
 "<arquivo>]"
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1397,12 +1376,6 @@ msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<arquivo>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-"                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2263,7 +2236,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2422,48 +2395,48 @@ msgid "line %d: Second %s"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "%s não pode ser construido nesta arquitetura\n"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "não foi passado pacote para desinstalação"
@@ -3598,11 +3571,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3623,6 +3591,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4244,42 +4217,42 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "não foi passado pacote para desinstalação"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -4342,6 +4315,11 @@ msgid "failed to create %s: %s\n"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
 #, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr ""
+#~ "                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
+
+#, fuzzy
 #~ msgid "query package owning file"
 #~ msgstr "pesquise o pacote ao qual <arquivo> pertence"
 

diff --git a/po/ro.po b/po/ro.po
index 1d1d670..0d6761c 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1160,11 +1160,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1181,32 +1176,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1224,10 +1203,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -1995,7 +1970,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2150,45 +2125,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3269,11 +3244,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3294,6 +3264,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3862,40 +3837,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 2169c9a..9fa2f55 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1247,11 +1247,6 @@ msgstr ""
 "éÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
 "       rpm {--help}"
 
-#: rpmqv.c:284
-#, fuzzy, c-format
-msgid "       %s {--version}\n"
-msgstr "       rpm {--version}"
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1269,35 +1264,18 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:302
-#, fuzzy, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-"       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <ËÁÔÁÌÏÇ>] [--noscripts] [--rcfile <ÆÁÊÌ>]"
 
-#: rpmqv.c:318
-#, fuzzy, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
 
-#: rpmqv.c:328
-#, fuzzy, c-format
-msgid "       %s {--querytags}\n"
-msgstr "       rpm {--querytags}"
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1316,11 +1294,6 @@ msgid ""
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <ÆÁÊÌ>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2153,7 +2126,7 @@ msgstr "
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ '-' × %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "ÓÔÒÏËÁ %d: BuildRoot ÎÅ ÍÏÖÅÔ ÂÙÔØ \"/\": %s"
@@ -2308,45 +2281,45 @@ msgstr "
 msgid "line %d: Second %s"
 msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ %s"
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr "ÓÔÒÏËÁ %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr "îÅÚÁËÒÙÔÙÊ %%if"
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: îÁÊÄÅÎ %%else ÂÅÚ if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: îÁÊÄÅÎ %%endif ÂÅÚ if"
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÂßÑ×ÌÅÎÉÅ %%include"
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr "îÅÔ ÁÒÈÉÔÅËÔÕÒ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÐÏÓÔÒÏÉÔØ"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr "ðÁËÅÔ ÎÅ ÉÍÅÅÔ %%description: %s"
 
@@ -3446,11 +3419,6 @@ msgstr "
 msgid "removing %d entries from %s index:\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3471,6 +3439,11 @@ msgstr "
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4045,40 +4018,40 @@ msgstr "
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d"
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ %c × %s(%s)"
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ max(%d)"
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "îÅÚÁËÒÙÔÁÑ %c: %s"
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr "%% Ó ÐÏÓÌÅÄÕÀÝÉÍ ÎÅÒÁÚÂÉÒÁÅÍÙÍ ÍÁËÒÏÓÏÍ"
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr "íÁËÒÏÓ %s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr "æÁÊÌ %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr "æÁÊÌ %s ÍÅÎØÛÅ %d ÂÁÊÔ"
@@ -4139,6 +4112,28 @@ msgstr "url port 
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n"
 
+#, fuzzy
+#~ msgid "       %s {--version}\n"
+#~ msgstr "       rpm {--version}"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
+#~ msgstr ""
+#~ "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
+
+#, fuzzy
+#~ msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
+#~ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
+
+#, fuzzy
+#~ msgid "       %s {--querytags}\n"
+#~ msgstr "       rpm {--querytags}"
+
+#, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
+
 #~ msgid "query package owning file"
 #~ msgstr "ÎÁÊÔÉ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ"
 

diff --git a/po/sk.po b/po/sk.po
index 9c40014..d68a3bb 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1250,11 +1250,6 @@ msgstr "nie je mo
 msgid "Usage: %s {--help}\n"
 msgstr "pou¾itie: rpm {--help}"
 
-#: rpmqv.c:284
-#, fuzzy, c-format
-msgid "       %s {--version}\n"
-msgstr "          rpm {--version}"
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1272,13 +1267,6 @@ msgid ""
 msgstr ""
 "          rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:302
-#, fuzzy, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-"          rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
@@ -1286,22 +1274,12 @@ msgstr ""
 "          rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
 "<súbor>]"
 
-#: rpmqv.c:318
-#, fuzzy, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr "          rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "          rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpmqv.c:328
-#, fuzzy, c-format
-msgid "       %s {--querytags}\n"
-msgstr "          rpm {--querytags}"
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1321,11 +1299,6 @@ msgstr ""
 "          rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<súbor>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr "                           [--sign] [--nobuild] [--timecheck <s>] ]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2157,7 +2130,7 @@ msgstr "riadok %d: Pr
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "riadok %d: Neprípustný znak '-' v %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "riadok %d: BuildRoot nemô¾e by» \"/\": %s"
@@ -2312,45 +2285,45 @@ msgstr "riadok %d: program skriptu mus
 msgid "line %d: Second %s"
 msgstr "riadok %d: Druhý %s"
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr "riadok %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "otvorenie zlyhalo: %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr "Neuzavretý %%if"
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: %%else bez if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: %%endif bez if"
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr "znetvorený príkaz %%include"
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr "®iadne zostaviteµné architektúry"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr "Balík neobsahuje %%description: %s"
 
@@ -3453,11 +3426,6 @@ msgstr "odstra
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3478,6 +3446,11 @@ msgstr "premenov
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4054,40 +4027,40 @@ msgstr "Makro %%%s obsahuje chybn
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d "
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Neznáma voµba %c v %s(%s)"
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)"
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Neukonèené %c: %s"
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr "balík %%%.*s nebol nájdený, vynecháva sa"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr "Preplnenie cieµovej vyrovnávacej pamäti"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr "Súbor %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr "Súbor %s je men¹í ako %d bajtov"
@@ -4148,6 +4121,29 @@ msgstr "url port mus
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
 
+#, fuzzy
+#~ msgid "       %s {--version}\n"
+#~ msgstr "          rpm {--version}"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
+#~ msgstr ""
+#~ "          rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
+
+#, fuzzy
+#~ msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
+#~ msgstr ""
+#~ "          rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
+
+#, fuzzy
+#~ msgid "       %s {--querytags}\n"
+#~ msgstr "          rpm {--querytags}"
+
+#, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr "                           [--sign] [--nobuild] [--timecheck <s>] ]"
+
 #~ msgid "query package owning file"
 #~ msgstr "opýta» sa balíku vlastniaceho súbor"
 

diff --git a/po/sl.po b/po/sl.po
index 30fc2be..ba09375 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.64 2000/06/20 21:45:52 jbj Exp $
+# $Id: sl.po,v 1.65 2000/06/21 23:48:06 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1236,11 +1236,6 @@ msgstr "ni mo
 msgid "Usage: %s {--help}\n"
 msgstr "uporaba: rpm {--help}"
 
-#: rpmqv.c:284
-#, fuzzy, c-format
-msgid "       %s {--version}\n"
-msgstr "       rpm {--version}"
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1258,35 +1253,18 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:302
-#, fuzzy, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-"       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <imenik>] [--noscripts] [--rcfile <datoteka>]"
 
-#: rpmqv.c:318
-#, fuzzy, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpmqv.c:328
-#, fuzzy, c-format
-msgid "       %s {--querytags}\n"
-msgstr "       rpm {--querytags}"
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1306,11 +1284,6 @@ msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<datoteka>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2138,7 +2111,7 @@ msgstr "vrstica %d: Prazna zna
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "BuildRoot ne more biti \"/\": %s"
@@ -2295,45 +2268,45 @@ msgstr "vrstica %d: skriptni program se mora za
 msgid "line %d: Second %s"
 msgstr "vrstica %d: Drugi %s"
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr "vrstica %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr "Nezakljuèeni %%if"
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s:%d: parseExpressionBoolean vrne %d"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: Najden %%else brez pripadajoèega if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: Najden %%endif brez pripadajoèega if"
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr "Deformiran stavek %%include"
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr "Arhitektura za izgradnjo manjka"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr "V paketu manjka %%description: %s"
 
@@ -3436,11 +3409,6 @@ msgstr "odstranjujemo seznam skupin\n"
 msgid "removing %d entries from %s index:\n"
 msgstr "odstranjujemo seznam imen\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3461,6 +3429,11 @@ msgstr "preimenujemo %s v %s\n"
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4033,40 +4006,40 @@ msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)"
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d"
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Neznana izbira %c v %s(%s)"
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)"
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Nezakljuèeni %c: %s"
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr "Oznaki %% sledi nerazèlenljiv makro"
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Makro %%%.*s ni najden, preskoèimo"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr "Ciljni medpomnilnik prekoraèen"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr "Datoteka %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr "Datoteka %s je kraj¹a od %d bajtov"
@@ -4127,6 +4100,28 @@ msgstr "vrata URL morajo biti 
 msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
 
+#, fuzzy
+#~ msgid "       %s {--version}\n"
+#~ msgstr "       rpm {--version}"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
+#~ msgstr ""
+#~ "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
+
+#, fuzzy
+#~ msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
+#~ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
+
+#, fuzzy
+#~ msgid "       %s {--querytags}\n"
+#~ msgstr "       rpm {--querytags}"
+
+#, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
+
 #~ msgid "query package owning file"
 #~ msgstr "poizvedba po paketu, ki vsebuje datoteko"
 

diff --git a/po/sr.po b/po/sr.po
index 3accd01..2fb7715 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -1261,11 +1261,6 @@ msgstr "Ne mogu da otvorim datoteku %s: "
 msgid "Usage: %s {--help}\n"
 msgstr "kori¹æenje: {rpm --help}"
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1282,32 +1277,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1325,11 +1304,6 @@ msgid ""
 "<file>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr "\t\t\t   paket1 ...paketN"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2156,7 +2130,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2311,46 +2285,46 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "paket %s nije naveden u %s"
@@ -3471,11 +3445,6 @@ msgstr "gre
 msgid "removing %d entries from %s index:\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3496,6 +3465,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4088,41 +4062,41 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "paket %s nije naðen u %s"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -4185,6 +4159,10 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr "\t\t\t   paket1 ...paketN"
+
+#, fuzzy
 #~ msgid "query package owning file"
 #~ msgstr "upit nad paketom koji ima <datoteku>"
 

diff --git a/po/sv.po b/po/sv.po
index 66a646c..40f5db3 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-0400\n"
 "PO-Revision-Date: 2000-06-21 23:38+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1205,11 +1205,6 @@ msgstr "kan inte 
 msgid "Usage: %s {--help}\n"
 msgstr "Användning: %s {--help}\n"
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1227,32 +1222,16 @@ msgid ""
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr "       %s {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]\n"
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr "       %s {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]\n"
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1272,10 +1251,6 @@ msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<fil>]\n"
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2048,7 +2023,7 @@ msgstr "rad %d: Tom tagg: %s"
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "rad %d: Otillåtet tecken \"-\" i %s: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "BuildRoot kan inte vara \"/\": %s"
@@ -2203,45 +2178,45 @@ msgstr "rad %d: skriptprogram m
 msgid "line %d: Second %s"
 msgstr "rad %d: Andra %s"
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr "rad %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr "Oavslutat %%if"
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s:%d: parseExpressionBoolean returnerar %d"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: Fick ett %%else utan något if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: Fick ett %%endif utan något if"
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr "felformatterad %%include-sats"
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr "Inga byggbara arkitekturer"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr "Paketet har ingen %%description: %s"
 
@@ -3363,11 +3338,6 @@ msgstr "tar bort \"%s\" fr
 msgid "removing %d entries from %s index:\n"
 msgstr "tar bort %d poster från %s-index:\n"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3388,6 +3358,11 @@ msgstr "l
 msgid "adding %d entries to %s index:\n"
 msgstr "lägger till %d poster till %s-index:\n"
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3958,40 +3933,40 @@ msgstr "Makro %%%s har otill
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) var inte använd under nivå %d"
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Okänd flagga %c i %s(%s)"
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "Rekursionsdjup(%d) större än max(%d)"
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Oavslutad %c: %s"
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr "Ett %% följs av ett makro som inte kan parsas"
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Inget makro %%%.*s hittat, hoppar över"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr "Målbuffer översvämmad"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr "Fil %s: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr "Fil %s är mindre än %d byte"

diff --git a/po/tr.po b/po/tr.po
index 1a8802e..d47914f 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1300,11 +1300,6 @@ msgstr "%s dosyas
 msgid "Usage: %s {--help}\n"
 msgstr "Kullaným: rpm {--help}"
 
-#: rpmqv.c:284
-#, fuzzy, c-format
-msgid "       %s {--version}\n"
-msgstr "       rpm {--version}"
-
 #: rpmqv.c:287
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1322,35 +1317,18 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:302
-#, fuzzy, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-"       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
-
 #: rpmqv.c:312
 #, fuzzy, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
 
-#: rpmqv.c:318
-#, fuzzy, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
-
 #: rpmqv.c:325
 #, fuzzy, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpmqv.c:328
-#, fuzzy, c-format
-msgid "       %s {--querytags}\n"
-msgstr "       rpm {--querytags}"
-
 #: rpmqv.c:329
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1370,12 +1348,6 @@ msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<dosya>]"
 
-#: rpmqv.c:335
-#, fuzzy
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-"                        [--sign] [--test] [--timecheck <s>] [--buildos <os>]"
-
 #: rpmqv.c:338
 #, fuzzy, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2205,7 +2177,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "%s açýlamadý: %s"
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2360,47 +2332,47 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "%s açýlamadý: %s"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s 'ye eriþimde hata oluþtu\n"
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "paket mimarisini doðrulamaz"
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "%s paketi %s altýnda gözükmüyor"
@@ -3524,11 +3496,6 @@ msgstr "%s kayd
 msgid "removing %d entries from %s index:\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
@@ -3549,6 +3516,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
@@ -4141,41 +4113,41 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "%s pakedi %s içerisinde bulunamadý"
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "%s açýlamadý: %s"
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -4238,6 +4210,29 @@ msgid "failed to create %s: %s\n"
 msgstr "%s yaratýlamýyor\n"
 
 #, fuzzy
+#~ msgid "       %s {--version}\n"
+#~ msgstr "       rpm {--version}"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
+#~ msgstr ""
+#~ "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
+
+#, fuzzy
+#~ msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
+#~ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
+
+#, fuzzy
+#~ msgid "       %s {--querytags}\n"
+#~ msgstr "       rpm {--querytags}"
+
+#, fuzzy
+#~ msgid "                        [--sign] [--nobuild] ]"
+#~ msgstr ""
+#~ "                        [--sign] [--test] [--timecheck <s>] [--buildos <os>]"
+
+#, fuzzy
 #~ msgid "query package owning file"
 #~ msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 

diff --git a/po/uk.po b/po/uk.po
index 09e52d3..16151e4 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-20 14:36-0400\n"
+"POT-Creation-Date: 2000-06-21 19:14-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"
@@ -1165,11 +1165,6 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:284
-#, c-format
-msgid "       %s {--version}\n"
-msgstr ""
-
 #: rpmqv.c:287
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -1186,32 +1181,16 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:302
-#, c-format
-msgid ""
-"       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
 #: rpmqv.c:312
 #, c-format
 msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:318
-#, c-format
-msgid "       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
-msgstr ""
-
 #: rpmqv.c:325
 #, c-format
 msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:328
-#, c-format
-msgid "       %s {--querytags}\n"
-msgstr ""
-
 #: rpmqv.c:329
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
@@ -1229,10 +1208,6 @@ msgid ""
 "<file>]\n"
 msgstr ""
 
-#: rpmqv.c:335
-msgid "                        [--sign] [--nobuild] ]"
-msgstr ""
-
 #: rpmqv.c:338
 #, c-format
 msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
@@ -2000,7 +1975,7 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:442 build/parseSpec.c:374
+#: build/parsePreamble.c:442 build/parseSpec.c:376
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
@@ -2155,45 +2130,45 @@ msgstr ""
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:135
+#: build/parseSpec.c:137
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:186
+#: build/parseSpec.c:188
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:198
+#: build/parseSpec.c:200
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:259
+#: build/parseSpec.c:261
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:267
+#: build/parseSpec.c:269
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:278
+#: build/parseSpec.c:280
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:292 build/parseSpec.c:301
+#: build/parseSpec.c:294 build/parseSpec.c:303
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:469
+#: build/parseSpec.c:471
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:520
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -3274,11 +3249,6 @@ msgstr ""
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1744 lib/rpmdb.c:1965
-#, c-format
-msgid "%6d %s\n"
-msgstr ""
-
 #: lib/rpmdb.c:1877
 #, c-format
 msgid "error(%d) allocating new package instance"
@@ -3299,6 +3269,11 @@ msgstr ""
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
+#: lib/rpmdb.c:1965
+#, c-format
+msgid "%6d %s\n"
+msgstr ""
+
 #: lib/rpmdb.c:2316
 #, c-format
 msgid "rebuilding database %s into %s\n"
@@ -3867,40 +3842,40 @@ msgstr ""
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:711
+#: rpmio/macro.c:698
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:891
+#: rpmio/macro.c:854
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:957 rpmio/macro.c:973
+#: rpmio/macro.c:920 rpmio/macro.c:936
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1013
+#: rpmio/macro.c:976
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1139
+#: rpmio/macro.c:1102
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1220
+#: rpmio/macro.c:1183
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1400 rpmio/macro.c:1406
+#: rpmio/macro.c:1363 rpmio/macro.c:1369
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1409
+#: rpmio/macro.c:1372
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""

diff --git a/rpm.spec b/rpm.spec
index 6dfceec..43d6a3a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -258,6 +258,7 @@ fi
 * Wed Jun 21 2000 Jeff Johnson <jbj@redhat.com>
 - fix: don't expand macros in false branch of %if (kasal@suse.cz).
 - fix: macro expansion problem and clean up (#11484) (kasal@suse.cz).
+- uname on i370 has s390 as arch (#11456).
 
 * Tue Jun 20 2000 Jeff Johnson <jbj@redhat.com>
 - fix: typo in brp-compress caused i18n man pages not to compress.

diff --git a/rpmrc.in b/rpmrc.in
index b495cc0..55ccb5f 100644 (file)
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,4 +1,4 @@
-# $Id: rpmrc.in,v 2.25 2000/06/20 16:29:23 jbj Exp $
+# $Id: rpmrc.in,v 2.26 2000/06/21 23:48:05 jbj Exp $
 
 #############################################################
 
@@ -77,8 +77,8 @@ arch_canon:   falcon: m68kmint        13
 arch_canon:    atariclone: m68kmint    13
 arch_canon:    milan: m68kmint         13
 arch_canon:    hades: m68kmint         13
+arch_canon:    s390: s390      14
 arch_canon:    i370: i370      14
-arch_canon:    i390: i390      15
 
 #############################################################
 # Canonical OS names and numbers
@@ -196,7 +196,7 @@ arch_compat: atariclone: m68kmint noarch
 arch_compat: milan: m68kmint noarch
 arch_compat: hades: m68kmint noarch
 
-arch_compat: i390: i370
+arch_compat: s390: i370
 arch_compat: i370: noarch
 
 arch_compat: ia64: noarch
@@ -258,7 +258,7 @@ buildarch_compat: milan: m68kmint noarch
 buildarch_compat: hades: m68kmint noarch
 
 buildarch_compat: ia64: noarch
-buildarch_compat: i390: noarch
+buildarch_compat: s390: noarch
 
 macrofiles:    @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros