Merge strings

1 files changed, 11 insertions, 12 deletions

diff --git a/po/de.po b/po/de.po
index 41769d64..283b520c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-21 14:52+0200\n"
+"POT-Creation-Date: 2005-04-21 15:09+0200\n"
 "PO-Revision-Date: 2005-01-31 22:24+0100\n"
 "Last-Translator: Frank Koester <frank@dueppel13.de>\n"
 "Language-Team: Deutsch\n"
@@ -1468,7 +1468,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - installiere nur Quellpakete (keine Binärpakete).\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2176,16 +2176,6 @@ msgstr ""
 "\n"
 "Verwendung:\n"
 
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - behalte existierende Pakete wenn möglich, lehne "
-"angefragte\n"
-"                   Pakete ab, die zu einer Deinstallation führen.\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2344,6 +2334,15 @@ msgstr "Keine Dateiliste gefunden\n"
 msgid "No changelog found\n"
 msgstr "Kein Changelog gefunden\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr ""
+#~ "  --keep         - behalte existierende Pakete wenn möglich, lehne "
+#~ "angefragte\n"
+#~ "                   Pakete ab, die zu einer Deinstallation führen.\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "außerstande Datei [%s] zu schreiben"