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/da.po | 68 +++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

(limited to 'po/da.po')

diff --git a/po/da.po b/po/da.po
index 687754f6..37834cbc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,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-05-20 13:28+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -590,6 +590,21 @@ msgstr "Vigtighed: "
 msgid "Unable to create medium."
 msgstr "Kan ikke lave medie."
 
+#: ../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 skal fjernes for at andre skal kunne opdateres:\n"
+"\n"
+"%s\n"
+"\n"
+"Er det O.k. at fortsætte?"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid ""
@@ -820,6 +835,21 @@ msgstr "Alvorlig fejl: ingen pakke fundet til installation. Beklager."
 msgid "Some packages can't be removed"
 msgstr "Visse pakker kan ikke fjernes"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Desværre, følgende pakker kan ikke vælges:\n"
+"\n"
+"%s\n"
+"\n"
+"Årsager følger:\n"
+"\n"
+"%s"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1009,23 +1039,6 @@ msgstr "Normal information"
 msgid "Removable device"
 msgstr "Udskiftelig enhed"
 
-#: ../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 skal fjernes for at andre skal kunne opdateres:\n"
-"\n"
-"%s\n"
-"\n"
-"Er det O.k. at fortsætte?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1240,25 +1253,6 @@ msgstr "Beskrivelse: "
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Desværre, følgende pakker kan ikke vælges:\n"
-"\n"
-"%s\n"
-"\n"
-"Årsager følger:\n"
-"\n"
-"%s"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1