From afea9f23bd47b71e45bc0b1ee689be5c6230ff87 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 18 Jun 2003 17:08:29 +0000
Subject: merge

---
 po/no.po | 58 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

(limited to 'po/no.po')

diff --git a/po/no.po b/po/no.po
index 1e3bbf27..6f15d21d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-13 21:08+0200\n"
+"POT-Creation-Date: 2003-06-18 19:02+0200\n"
 "PO-Revision-Date: 2003-02-13 17:56+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norsk Bokmål <cooker-i18n@linux-mandrake.com>\n"
@@ -592,6 +592,21 @@ msgstr "Viktighet: "
 msgid "Unable to create medium."
 msgstr "Kan ikke opprette media."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
+"\n"
+"%s\n"
+"\n"
+"ER det ok å fortsette?"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid ""
@@ -824,6 +839,16 @@ msgstr "Forbereder pakker for installasjon..."
 msgid "Some packages can't be removed"
 msgstr "Pakke `%s' kan ikke installeres\n"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Beklager, følgende pakke(r) kan ikke velges:\n"
+"\n"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1009,23 +1034,6 @@ msgstr "Normal informasjon"
 msgid "Removable device"
 msgstr "Fjernbar enhet"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"(waiting for urpmi subroutine for explanation)\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
-"\n"
-"%s\n"
-"\n"
-"ER det ok å fortsette?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1240,20 +1248,6 @@ msgstr "Beskrivelser"
 msgid "%s KB"
 msgstr "%.1f KB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Beklager, følgende pakke(r) kan ikke velges:\n"
-"\n"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1