- no-brainer refcounts for rpmProblemSet object.

CVS patchset: 5163
CVS date: 2001/11/09 17:22:08

1 files changed, 63 insertions, 58 deletions

diff --git a/po/id.po b/po/id.po
index eef15a11f..670b330d7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-08 16:51-0500\n"
+"POT-Creation-Date: 2001-11-09 12:21-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:2144
+#: build/pack.c:603 lib/psm.c:2146
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2409
+#: build/pack.c:683 lib/psm.c:2411
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954
+#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2105,181 +2105,186 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:201
-msgid "conflicts with"
+#. @observer@
+#: lib/problems.c:229
+msgid "different"
 msgstr ""
 
-#: lib/problems.c:201
-msgid "is needed by"
-msgstr ""
-
-#: lib/problems.c:244
+#: lib/problems.c:237
 #, c-format
-msgid "package %s is for a different architecture"
+msgid "package %s is intended for a %s architecture"
 msgstr ""
 
-#: lib/problems.c:249
+#: lib/problems.c:242
 #, c-format
-msgid "package %s is for a different operating system"
+msgid "package %s is intended for a %s operating system"
 msgstr ""
 
-#: lib/problems.c:254
+#: lib/problems.c:247
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:259
+#: lib/problems.c:252
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:264
+#: lib/problems.c:257
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:269
+#: lib/problems.c:262
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:274
+#: lib/problems.c:267
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:279
+#: lib/problems.c:272
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:289
+#: lib/problems.c:282
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:294
+#: lib/problems.c:287
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:298
+#: lib/problems.c:291
 #, c-format
 msgid "package %s has unsatisfied Requires: %s\n"
 msgstr ""
 
-#: lib/problems.c:302
+#: lib/problems.c:295
 #, c-format
 msgid "package %s has unsatisfied Conflicts: %s\n"
 msgstr ""
 
-#: lib/problems.c:307
+#: lib/problems.c:300
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:270
+#: lib/problems.c:380
+msgid "conflicts with"
+msgstr ""
+
+#: lib/problems.c:380
+msgid "is needed by"
+msgstr ""
+
+#: lib/psm.c:272
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:274
+#: lib/psm.c:276
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:277
+#: lib/psm.c:279
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:347
+#: lib/psm.c:349
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:413
+#: lib/psm.c:415
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:423
+#: lib/psm.c:425
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:502
+#: lib/psm.c:504
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1153
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1157
+#: lib/psm.c:1159
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1198
+#: lib/psm.c:1200
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1322
+#: lib/psm.c:1324
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1434
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1602
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1609
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1949
+#: lib/psm.c:1951
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2066
+#: lib/psm.c:2068
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2180
+#: lib/psm.c:2182
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2189
+#: lib/psm.c:2191
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2230
+#: lib/psm.c:2232
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2231
+#: lib/psm.c:2233
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2419
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2420
+#: lib/psm.c:2422
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2328,7 +2333,7 @@ msgid "can't query %s: %s\n"
 msgstr ""
 
 #: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
-#: lib/rpminstall.c:841
+#: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2401,7 +2406,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:629
+#: lib/query.c:854 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2491,7 +2496,7 @@ msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:552
+#: lib/rpmds.c:554
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2536,7 +2541,7 @@ msgstr ""
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:462 lib/rpminstall.c:697
+#: lib/rpminstall.c:462 lib/rpminstall.c:696
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
@@ -2554,26 +2559,26 @@ msgstr ""
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:562
+#: lib/rpminstall.c:561
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:631
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:656
+#: lib/rpminstall.c:655
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:683
+#: lib/rpminstall.c:682
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:689
+#: lib/rpminstall.c:688
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2820,13 +2825,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:244
+#: lib/transaction.c:249
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:883
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""