- fix: insure that %lang scopes over hard links correctly.

- fix: rpmCleanPath was nibbling at .. in macrofiles incorrectly.

CVS patchset: 4464
CVS date: 2001/01/19 01:38:55

1 files changed, 78 insertions, 56 deletions

diff --git a/po/pl.po b/po/pl.po
index 15100edbe..5f05bf94e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-17 10:57-0500\n"
+"POT-Creation-Date: 2001-01-18 20:21-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1328,7 +1328,7 @@ msgstr "       rpm {--initdb}   [--dbpath <katalog>]"
 
 #: rpmqv.c:418
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
 
 #: rpmqv.c:422
@@ -1341,35 +1341,35 @@ msgstr ""
 #: rpmqv.c:425
 #, fuzzy
 msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+"                        [--rcfile <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
 
 #: rpmqv.c:434
 #, fuzzy
 msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+"                        [--excludedocs] [--includedocs] [--rcfile <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
 
 #: rpmqv.c:442
 #, fuzzy, c-format
 msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
 #: rpmqv.c:449
 #, fuzzy
 msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+"                        [--scripts] [--root <dir>] [--rcfile <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
 
 #: rpmqv.c:456
 #, fuzzy, c-format
 msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
@@ -1386,19 +1386,19 @@ msgstr "       rpm {--setugids} [-afpg] [cel]"
 #: rpmqv.c:465
 #, fuzzy, c-format
 msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+"       %s {--resign} [--rcfile <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
 #: rpmqv.c:466
 #, fuzzy, c-format
 msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+"       %s {--addsign} [--rcfile <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
 #: rpmqv.c:467
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<file:...>]\n"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
@@ -1429,8 +1429,8 @@ msgstr "    --pipe <komenda>      "
 
 #: rpmqv.c:518
 #, fuzzy
-msgid "   --macros <file:...>    "
-msgstr "Użyj -e lub --erase\n"
+msgid "   --rcfile <file:...>    "
+msgstr "      --rcfile <plik>     "
 
 #: rpmqv.c:519
 msgid "use <file:...> instead of default list of macro files"
@@ -1758,169 +1758,169 @@ msgstr "&& i || nie jest wspierane dla łańcuchów znakowych"
 msgid "syntax error in expression\n"
 msgstr "błąd składni w wyrażeniu"
 
-#: build/files.c:226
+#: build/files.c:227
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK nie powiodło się: %s\n"
 
-#: build/files.c:276 build/files.c:360 build/files.c:527
+#: build/files.c:278 build/files.c:363 build/files.c:538
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Brak '(' w %s %s"
 
-#: build/files.c:287 build/files.c:479 build/files.c:538
+#: build/files.c:289 build/files.c:483 build/files.c:549
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Brak ')' w %s(%s"
 
-#: build/files.c:325 build/files.c:504
+#: build/files.c:327 build/files.c:508
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Błędny znak %s: %s"
 
-#: build/files.c:376
+#: build/files.c:379
 #, fuzzy, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Brak białego znaku po %s(): %s"
 
-#: build/files.c:414
+#: build/files.c:417
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Błędna składnia: %s(%s)"
 
-#: build/files.c:424
+#: build/files.c:427
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Błędne określenie trybu: %s(%s)"
 
-#: build/files.c:436
+#: build/files.c:439
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Błędne określenie dirmode: %s(%s)"
 
-#: build/files.c:565
+#: build/files.c:576
 #, fuzzy
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Niespotykana długość określenia lokalizacji \"%.*s\" w %%lang(%s)"
 
-#: build/files.c:575
+#: build/files.c:586
 #, fuzzy
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Powtórzone określenie lokalizacji %.*s w %%lang(%s)"
 
-#: build/files.c:707
+#: build/files.c:723
 #, fuzzy
 msgid "Hit limit for %%docdir\n"
 msgstr "Limit trafień dla %%docdir"
 
-#: build/files.c:713
+#: build/files.c:729
 #, fuzzy
 msgid "Only one arg for %%docdir\n"
 msgstr "Tylko jeden argument dla %%docdir"
 
 #. We already got a file -- error
-#: build/files.c:741
+#: build/files.c:757
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dwa pliki w jedenj linii: %s"
 
-#: build/files.c:755
+#: build/files.c:771
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Plik musi się zaczynać od \"/\": %s"
 
-#: build/files.c:767
+#: build/files.c:783
 #, fuzzy
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie można mieszać specjalnej %%doc z innymi formami: %s"
 
-#: build/files.c:861
+#: build/files.c:949
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Plik podany dwukrotnie: %s"
 
-#: build/files.c:972
+#: build/files.c:1060
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1066
+#: build/files.c:1155
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Plik nie zgadza się z prefiksem (%s): %s"
 
-#: build/files.c:1076
+#: build/files.c:1165
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1119 build/files.c:1639 build/parsePrep.c:42
+#: build/files.c:1208 build/files.c:1732 build/parsePrep.c:42
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Błędny użytkownik/grupa: %s\n"
 
-#: build/files.c:1131
+#: build/files.c:1220
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Plik %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1207
+#: build/files.c:1297
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Plik musi się zaczynać od \"/\": %s"
 
-#: build/files.c:1237
+#: build/files.c:1327
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1292
+#: build/files.c:1382
 #, fuzzy
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nie można otworzyć %%files pliku: %s"
 
-#: build/files.c:1301 build/pack.c:108
+#: build/files.c:1391 build/pack.c:108
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "linia: %s"
 
-#: build/files.c:1627
+#: build/files.c:1720
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "plik %s: %s\n"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1696
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie można uruchomić %s"
 
-#: build/files.c:1701
+#: build/files.c:1794
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie można wykonać fork na %s"
 
-#: build/files.c:1783
+#: build/files.c:1876
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s nie powiodło się"
 
-#: build/files.c:1787
+#: build/files.c:1880
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "zapisanie wszystkich danych do %s nie powiodło się"
 
-#: build/files.c:1912
+#: build/files.c:2005
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Wyszukiwanie wymaganych zasobów...\n"
 
-#: build/files.c:1940 build/files.c:1954
+#: build/files.c:2033 build/files.c:2047
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Wyszukiwanie nie powiodło się"
 
-#: build/files.c:2067
+#: build/files.c:2160
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plików: %s\n"
@@ -2567,31 +2567,25 @@ msgstr "pakiet %s jest w konflikcie: %s\n"
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#. T3. Record next "q <- p" relation (i.e. "p" requires "q").
-#: lib/depends.c:1580
-#, c-format
-msgid "========== %s <- %s\n"
-msgstr ""
-
 #. Record all relations.
-#: lib/depends.c:1663
+#: lib/depends.c:1662
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1710
+#: lib/depends.c:1709
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1755
+#: lib/depends.c:1754
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1804
+#: lib/depends.c:1803
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1835
+#: lib/depends.c:1834
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -4302,6 +4296,34 @@ msgstr "port musi być liczbą\n"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiodło się\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+#~ msgstr ""
+#~ "                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
+
+#, fuzzy
+#~ msgid ""
+#~ "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+#~ msgstr ""
+#~ "                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
+
+#, fuzzy
+#~ msgid ""
+#~ "                        [--scripts] [--root <dir>] [--macros <file:...>]"
+#~ msgstr ""
+#~ "                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+#~ msgstr ""
+#~ "       rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
+
+#, fuzzy
+#~ msgid "   --macros <file:...>    "
+#~ msgstr "Użyj -e lub --erase\n"
+
 #~ msgid "Bad owner/group: %s"
 #~ msgstr "Błędny użytkownik/grupa: %s"