[MERGE]: Merged with team1.

bzr revid: uco@tinyerp.com-20101102052238-qceyxo5z4gwb52am

1 files changed, 38 insertions, 23 deletions

diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
index e14cd9b9e92..3e6e78c5192 100644
--- a/addons/knowledge/i18n/de.po
+++ b/addons/knowledge/i18n/de.po
@@ -1,20 +1,20 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* knowledge
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-05 13:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-11-01 10:03+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-11-02 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -22,41 +22,45 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Die Objektbezeichnung muss mit x_ starten und darf keine Sonderzeichen haben "
+"!"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki:0
 msgid "Collaborative Content (Wiki)"
-msgstr ""
+msgstr "Wikipedia"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_quality_manual:0
 msgid "Creates an example skeleton for a standard quality manual."
 msgstr ""
+"Erzeugt als Beispiel ein Grundgerüst für eine Dokumentation zum "
+"Qualitätsmanagement"
 
 #. module: knowledge
 #: field:knowledge.installer,document_ftp:0
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "Gemeinsames Verzeichnis (FTP)"
 
 #. module: knowledge
 #: model:ir.module.module,shortdesc:knowledge.module_meta_information
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Knowledge Management System"
 
 #. module: knowledge
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
 
 #. module: knowledge
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Fehlerhafte Modellbezeichnung in der Aktion"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
-msgstr ""
+msgstr "Knowledge"
 
 #. module: knowledge
 #: help:knowledge.installer,document_ftp:0
@@ -72,16 +76,20 @@ msgid ""
 "you access attachments and virtual documents through your standard file "
 "browser."
 msgstr ""
+"Bietet einen WebDAV Zugriff zum OpenERP Dokumenten Management. Hierdurch "
+"können Sie auf Dateianhänge sowie Dokumente über einen klassischen "
+"Dateibrowser Ihres Betriebssystems, wie z.B. Explorer, Nautilus, Commander "
+"zugreifen."
 
 #. module: knowledge
 #: field:knowledge.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Abfolge Konfiguration"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "title"
-msgstr ""
+msgstr "Bezeichnung"
 
 #. module: knowledge
 #: model:ir.module.module,description:knowledge.module_meta_information
@@ -89,26 +97,28 @@ msgid ""
 "Installer for knowledge-based tools\n"
 "    "
 msgstr ""
+"Assistent zur Installation der Knowledge Management Tools.\n"
+"    "
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
 
 #. module: knowledge
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Fehlerhafter XML Quellcode für die Ansicht!"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
 msgid "Quality Manual"
-msgstr ""
+msgstr "Qualitätshandbuch"
 
 #. module: knowledge
 #: field:knowledge.installer,document_webdav:0
 msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "Gemeinsame Verzeichnisse (WebDav)"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_faq:0
@@ -116,16 +126,18 @@ msgid ""
 "Creates a skeleton internal FAQ pre-filled with documentation about "
 "OpenERP's Document Management System."
 msgstr ""
+"Erzeugt als Beispiel ein Grundgerüst für ein internes FAQ mit Fragen & "
+"Antworten zu OpenERP's Dokumenten Management."
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_faq:0
 msgid "Internal FAQ"
-msgstr ""
+msgstr "Internes FAQ"
 
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bild"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
@@ -143,6 +155,9 @@ msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
 msgstr ""
+"Sie können Wikis und gemeinsame Verzeichnisse erstellen um "
+"dasUnternehmenswissen zentral zu verwalten und Mitarbeitern Zugriff zu "
+"gewähren."
 
 #. module: knowledge
 #: view:knowledge.installer:0