- disambiguate added/installed dependency failures (#50388).

CVS patchset: 5532
CVS date: 2002/06/28 21:54:24

1 files changed, 49 insertions, 47 deletions

diff --git a/po/no.po b/po/no.po
index af4577f16..dc0f0d478 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-28 08:45-0400\n"
+"POT-Creation-Date: 2002-06-28 17:47-0400\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1456,42 +1456,42 @@ msgstr ""
 msgid "(db package)"
 msgstr "ingen pakker\n"
 
-#: lib/depends.c:832
+#: lib/depends.c:834
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:953
+#: lib/depends.c:955
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1229
+#: lib/depends.c:1231
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1335
+#: lib/depends.c:1337
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1428
+#: lib/depends.c:1430
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1498
+#: lib/depends.c:1500
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1538
+#: lib/depends.c:1540
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
@@ -2174,7 +2174,7 @@ msgid "can't query %s: %s\n"
 msgstr "kan ikke spørre på %s: %s\n"
 
 #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503
-#: lib/rpminstall.c:888
+#: lib/rpminstall.c:891
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under åpning av %s: %s\n"
@@ -2420,7 +2420,7 @@ msgstr "feil under lesing fra fil %s\n"
 msgid "file %s requires a newer version of RPM\n"
 msgstr "fil %s trenger en nyere versjon av RPM\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:744
+#: lib/rpminstall.c:495 lib/rpminstall.c:747
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
@@ -2430,7 +2430,7 @@ msgstr ""
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:545 lib/rpminstall.c:1075
+#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "feilede avhengigheter:\n"
@@ -2453,21 +2453,17 @@ msgstr ""
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:704
-msgid "removing these packages would break dependencies:\n"
-msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
-
-#: lib/rpminstall.c:731
+#: lib/rpminstall.c:734
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke åpne %s: %s\n"
 
-#: lib/rpminstall.c:737
+#: lib/rpminstall.c:740
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpminstall.c:1069
+#: lib/rpminstall.c:1072
 #, c-format
 msgid "rollback %d packages to %s"
 msgstr ""
@@ -2478,85 +2474,80 @@ msgid "read failed: %s (%d)\n"
 msgstr "lesing feilet: %s (%d)\n"
 
 #. @observer@
-#: lib/rpmps.c:218
+#: lib/rpmps.c:200
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:226
+#: lib/rpmps.c:208
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "pakke %s er for en annen arkitektur"
 
-#: lib/rpmps.c:231
+#: lib/rpmps.c:213
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "pakke %s er for et annet operativsystem"
 
-#: lib/rpmps.c:236
+#: lib/rpmps.c:218
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakke %s er allerede installert"
 
-#: lib/rpmps.c:241
+#: lib/rpmps.c:223
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "sti %s i pakke %s kan ikke relokeres"
 
-#: lib/rpmps.c:246
+#: lib/rpmps.c:228
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/rpmps.c:251
+#: lib/rpmps.c:233
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/rpmps.c:256
+#: lib/rpmps.c:238
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/rpmps.c:261
+#: lib/rpmps.c:243
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:271
+#: lib/rpmps.c:253
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:276
+#: lib/rpmps.c:258
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/rpmps.c:280
+#: lib/rpmps.c:262
 #, fuzzy, c-format
-msgid "package %s has unsatisfied Requires: %s\n"
-msgstr "pakke %s er i konflikt: %s\n"
+msgid "%s is needed by %s%s"
+msgstr " kreves av %s-%s-%s\n"
+
+#: lib/rpmps.c:264 lib/rpmps.c:269
+#, fuzzy
+msgid "(installed) "
+msgstr "ikke installert"
 
-#: lib/rpmps.c:284
+#: lib/rpmps.c:267
 #, fuzzy, c-format
-msgid "package %s has unsatisfied Conflicts: %s\n"
-msgstr "pakke %s er i konflikt: %s\n"
+msgid "%s conflicts with %s%s"
+msgstr " er i konflikt med %s-%s-%s\n"
 
-#: lib/rpmps.c:289
+#: lib/rpmps.c:273
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmps.c:370
-#, fuzzy
-msgid "conflicts with"
-msgstr " er i konflikt med %s-%s-%s\n"
-
-#: lib/rpmps.c:370
-#, fuzzy
-msgid "is needed by"
-msgstr " kreves av %s-%s-%s\n"
-
 #: lib/rpmrc.c:201
 #, c-format
 msgid "missing second ':' at %s:%d\n"
@@ -3363,6 +3354,17 @@ msgstr "url-port må være et tall\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
+#~ msgid "removing these packages would break dependencies:\n"
+#~ msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
+
+#, fuzzy
+#~ msgid "package %s has unsatisfied Requires: %s\n"
+#~ msgstr "pakke %s er i konflikt: %s\n"
+
+#, fuzzy
+#~ msgid "package %s has unsatisfied Conflicts: %s\n"
+#~ msgstr "pakke %s er i konflikt: %s\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "kan ikke åpne database i %s\n"