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

(limited to 'po/de.po')

diff --git a/po/de.po b/po/de.po
index d2e83d98..80a1747d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-de\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-14 19:50+0000\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <cooker-i18n@linux-mandrake.com>\n"
@@ -592,6 +592,21 @@ msgstr "Wichtigkeit: "
 msgid "Unable to create medium."
 msgstr "Ich kann das Medium nicht anlegen."
 
+#: ../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 ""
+"Die Folgenden Pakete müssen entfernt weden, um andere zu aktualisieren:\n"
+"\n"
+"%s\n"
+"\n"
+"Soll ich fortfahren?"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid ""
@@ -823,6 +838,21 @@ msgstr ""
 msgid "Some packages can't be removed"
 msgstr "Einige Pakete können nicht entfernt werden"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Die folgenden Pakete können nicht ausgewählt werden:\n"
+"\n"
+"%s\n"
+"\n"
+"Gründe:\n"
+"\n"
+"%s"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1008,23 +1038,6 @@ msgstr "Normale Informationen"
 msgid "Removable device"
 msgstr "Wechselmedium"
 
-#: ../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 ""
-"Die Folgenden Pakete müssen entfernt weden, um andere zu aktualisieren:\n"
-"\n"
-"%s\n"
-"\n"
-"Soll ich fortfahren?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1238,25 +1251,6 @@ msgstr "Beschreibung: "
 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 ""
-"Die folgenden Pakete können nicht ausgewählt werden:\n"
-"\n"
-"%s\n"
-"\n"
-"Gründe:\n"
-"\n"
-"%s"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1