[MERGE] forward port of branch 8.0 up to e883193

3 files changed, 22 insertions, 16 deletions

diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 2f711f055fd..8c592e43093 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-09-15 15:51+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: 2014-08-15 07:05+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-09-16 08:34+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: document
 #: field:report.document.file,nbr:0
@@ -179,7 +180,7 @@ msgstr "Kontextfelder"
 #: field:document.directory.dctx,create_uid:0
 #: field:document.storage,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "Erstellt durch"
 
 #. module: document
 #: field:document.configuration,create_date:0
@@ -188,7 +189,7 @@ msgstr ""
 #: field:document.directory.dctx,create_date:0
 #: field:document.storage,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "Erstellt am"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -459,7 +460,7 @@ msgstr "Automatisch erzeugte Dokumente"
 #. module: document
 #: view:document.directory:document.view_document_directory_filter
 msgid "Group By"
-msgstr ""
+msgstr "Gruppierung"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -476,7 +477,7 @@ msgstr "Gruppen"
 #: field:report.document.file,id:0
 #: field:report.document.user,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: document
 #: help:document.directory,resource_find_all:0
@@ -543,7 +544,7 @@ msgstr "Letzte Änderung"
 #: field:document.directory.dctx,write_uid:0
 #: field:document.storage,write_uid:0
 msgid "Last Updated by"
-msgstr ""
+msgstr "Zuletzt aktualisiert durch"
 
 #. module: document
 #: field:document.configuration,write_date:0
@@ -552,7 +553,7 @@ msgstr ""
 #: field:document.directory.dctx,write_date:0
 #: field:document.storage,write_date:0
 msgid "Last Updated on"
-msgstr ""
+msgstr "Zuletzt aktualisiert am"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -623,6 +624,11 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"Das Odoo Dokument Management System verbindet virtuelle Ordner mit "
+"Dokumenten. Der virtuelle Ordner kann verwendet werden, um Anhänge eines "
+"Dokumentes zu verwalten, herunterzuladen und zu drucken.\r\n"
+"Die Verzeichnisse werden automatisch entsprechend der installierten Module "
+"angelegt."
 
 #. module: document
 #: view:document.directory:document.view_document_directory_form
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index 096c8081219..0fb989ff728 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2014-09-23 16:27+0000\n"
+"PO-Revision-Date: 2014-09-23 16:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. module: document
 #. openerp-web
-#: code:addons/document/static/src/js/document.js:17
+#: code:addons/document/static/src/js/document.js:19
 #, python-format
 msgid "%s (%s)"
 msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
 
 #. module: document
 #. openerp-web
-#: code:addons/document/static/src/js/document.js:6
+#: code:addons/document/static/src/js/document.js:7
 #, python-format
 msgid "Attachment(s)"
 msgstr ""
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index f837ebd09ef..8967cabe65d 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -31,7 +31,7 @@
 
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
-        <field name="type">automatic</field>
+        <field name="state">open</field>
     </record>
   </data>
 </openerp>