Merge with Michael and resolve conflicts

[apt.git] / po / de.po

diff --git a/po/de.po b/po/de.po
index cadfefe1279e62cb28e564eb4a1b1954d507cd04..9358ff248f69f78ba6932d2ab85c2b6e6b0de469 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"

 "PO-Revision-Date: 2005-06-15 18:22+0200\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team:  <de@li.org>\n"
 "PO-Revision-Date: 2005-06-15 18:22+0200\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team:  <de@li.org>\n"


@@ -2322,15 +2322,15 @@ msgstr "optional"
 msgid "extra"
 msgstr "extra"
 
 msgid "extra"
 msgstr "extra"
 

-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90

 msgid "Building dependency tree"
 msgstr "Abhängigkeitsbaum wird aufgebaut"
 
 msgid "Building dependency tree"
 msgstr "Abhängigkeitsbaum wird aufgebaut"
 

-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62

 msgid "Candidate versions"
 msgstr "Mögliche Versionen"
 
 msgid "Candidate versions"
 msgstr "Mögliche Versionen"
 

-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91

 msgid "Dependency generation"
 msgstr "Abhängigkeits-Generierung"
 
 msgid "Dependency generation"
 msgstr "Abhängigkeits-Generierung"