- rpmds: create dsProblem(), dsiGetDNEVR() retrieved DNEVR, not N.

- depends.h: hack around teIterator() et al from include for now.

CVS patchset: 5153
CVS date: 2001/11/04 15:43:26

1 files changed, 51 insertions, 34 deletions

diff --git a/po/zh.po b/po/zh.po
index 7a185c17f..da4bab4fb 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-02 21:16-0500\n"
+"POT-Creation-Date: 2001-11-04 10:27-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1410,104 +1410,93 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:108
+#: lib/depends.c:112
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:341
+#: lib/depends.c:345
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:346
+#: lib/depends.c:350
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:351
+#: lib/depends.c:355
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:600
+#: lib/depends.c:604
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:636
+#: lib/depends.c:640
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:652
+#: lib/depends.c:656
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:674
+#: lib/depends.c:678
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:686
+#: lib/depends.c:690
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:703
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:747
+#: lib/depends.c:751
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:749
+#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:749
+#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:812
-#, c-format
-msgid "package %s-%s-%s require not satisfied: %s\n"
-msgstr ""
-
-#. conflicts exist.
-#: lib/depends.c:884
-#, c-format
-msgid "package %s conflicts: %s\n"
-msgstr ""
-
-#: lib/depends.c:1147
+#: lib/depends.c:1103
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1399
+#: lib/depends.c:1350
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1473
+#: lib/depends.c:1424
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1548
+#: lib/depends.c:1499
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1609
+#: lib/depends.c:1560
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1644
+#: lib/depends.c:1595
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1649
+#: lib/depends.c:1600
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2409,6 +2398,15 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
+#: lib/rpmal.c:728
+#, c-format
+msgid "%9s: %-45s YES (added files)\n"
+msgstr ""
+
+#: lib/rpmal.c:826
+msgid "(added provide)"
+msgstr ""
+
 #: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
@@ -2472,6 +2470,25 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#. XXX legacy epoch-less requires/conflicts compatibility
+#: lib/rpmds.c:346
+#, c-format
+msgid ""
+"the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
+"\tA %s\tB %s\n"
+msgstr ""
+
+#: lib/rpmds.c:375
+#, c-format
+msgid "  %s    A %s\tB %s\n"
+msgstr ""
+
+#. @=branchstate@
+#: lib/rpmds.c:401
+#, c-format
+msgid "package %s-%s-%s has unsatisfied %s: %s\n"
+msgstr ""
+
 #: lib/rpminstall.c:153
 msgid "Preparing..."
 msgstr ""
@@ -2796,13 +2813,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:239
+#: lib/transaction.c:241
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:878
+#: lib/transaction.c:880
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""