[MERGE] forward port of branch 8.0 up to e883193

2 files changed, 155 insertions, 9 deletions

diff --git a/addons/base_import_module/i18n/base_import_module.pot b/addons/base_import_module/i18n/base_import_module.pot
index 3171c3e3335..590de207692 100644
--- a/addons/base_import_module/i18n/base_import_module.pot
+++ b/addons/base_import_module/i18n/base_import_module.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:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+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"
@@ -36,21 +36,21 @@ msgid "Created on"
 msgstr ""
 
 #. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:29
-#: code:addons/base_import_module/models/ir_module.py:80
-#: code:addons/base_import_module/models/ir_module.py:88
+#: code:addons/base_import_module/models/ir_module.py:30
+#: code:addons/base_import_module/models/ir_module.py:82
+#: code:addons/base_import_module/models/ir_module.py:91
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:88
+#: code:addons/base_import_module/models/ir_module.py:90
 #, python-format
 msgid "File '%s' exceed maximum allowed file size"
 msgstr ""
 
 #. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:80
+#: code:addons/base_import_module/models/ir_module.py:82
 #, python-format
 msgid "File is not a zip file!"
 msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
 #. module: base_import_module
 #: code:addons/base_import_module/models/ir_module.py:29
 #, python-format
-msgid "Unmet module dependencies: %s, "
+msgid "Unmet module dependencies: %s"
 msgstr ""
 
 #. module: base_import_module
diff --git a/addons/base_import_module/i18n/de.po b/addons/base_import_module/i18n/de.po
new file mode 100644
index 00000000000..8275073446f
--- /dev/null
+++ b/addons/base_import_module/i18n/de.po
@@ -0,0 +1,146 @@
+# German translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-09-18 12:18+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-09-19 08:19+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
+
+#. module: base_import_module
+#: view:base.import.module:base_import_module.view_base_module_import
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: base_import_module
+#: view:base.import.module:base_import_module.view_base_module_import
+msgid "Close"
+msgstr "Schließen"
+
+#. module: base_import_module
+#: field:base.import.module,create_uid:0
+msgid "Created by"
+msgstr "Erstellt durch"
+
+#. module: base_import_module
+#: field:base.import.module,create_date:0
+msgid "Created on"
+msgstr "Erstellt am"
+
+#. module: base_import_module
+#: code:addons/base_import_module/models/ir_module.py:29
+#: code:addons/base_import_module/models/ir_module.py:80
+#: code:addons/base_import_module/models/ir_module.py:88
+#, python-format
+msgid "Error !"
+msgstr "Fehler !"
+
+#. module: base_import_module
+#: code:addons/base_import_module/models/ir_module.py:88
+#, python-format
+msgid "File '%s' exceed maximum allowed file size"
+msgstr "Die Datei '%s' überschreitet die maximal erlaubte Dateigröße"
+
+#. module: base_import_module
+#: code:addons/base_import_module/models/ir_module.py:80
+#, python-format
+msgid "File is not a zip file!"
+msgstr "Das ist keine ZIP-Datei"
+
+#. module: base_import_module
+#: field:base.import.module,force:0
+msgid "Force init"
+msgstr "Erzwinge init"
+
+#. module: base_import_module
+#: help:base.import.module,force:0
+msgid ""
+"Force init mode even if installed. (will update `noupdate='1'` records)"
+msgstr ""
+"Erzwinge init Modus, auch wenn bereits installiert (Aktualisierung von "
+"`noupdate='1'` Daten)"
+
+#. module: base_import_module
+#: field:base.import.module,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: base_import_module
+#: view:base.import.module:base_import_module.view_base_module_import
+#: model:ir.actions.act_window,name:base_import_module.action_view_base_module_import
+#: model:ir.model,name:base_import_module.model_base_import_module
+#: model:ir.ui.menu,name:base_import_module.menu_view_base_module_import
+msgid "Import Module"
+msgstr "Modul importieren"
+
+#. module: base_import_module
+#: field:base.import.module,import_message:0
+msgid "Import message"
+msgstr "Mitteilung importieren"
+
+#. module: base_import_module
+#: view:base.import.module:base_import_module.view_base_module_import
+msgid "Import module"
+msgstr "Modul importieren"
+
+#. module: base_import_module
+#: field:base.import.module,write_uid:0
+msgid "Last Updated by"
+msgstr "Zuletzt aktualisiert von"
+
+#. module: base_import_module
+#: field:base.import.module,write_date:0
+msgid "Last Updated on"
+msgstr "Zuletzt aktualisiert am"
+
+#. module: base_import_module
+#: model:ir.model,name:base_import_module.model_ir_module_module
+msgid "Module"
+msgstr "Modul"
+
+#. module: base_import_module
+#: field:base.import.module,module_file:0
+msgid "Module .ZIP file"
+msgstr "Modul .ZIP Datei"
+
+#. module: base_import_module
+#: view:base.import.module:base_import_module.view_base_module_import
+msgid "Open Modules"
+msgstr "Öffne Modul"
+
+#. module: base_import_module
+#: view:base.import.module:base_import_module.view_base_module_import
+msgid "Select module package to import (.zip file):"
+msgstr "Wählen Sie das Modulpaket (zip Datei) für den Import"
+
+#. module: base_import_module
+#: field:base.import.module,state:0
+msgid "Status"
+msgstr ""
+
+#. module: base_import_module
+#: code:addons/base_import_module/models/ir_module.py:29
+#, python-format
+msgid "Unmet module dependencies: %s, "
+msgstr ""
+
+#. module: base_import_module
+#: selection:base.import.module,state:0
+msgid "done"
+msgstr ""
+
+#. module: base_import_module
+#: selection:base.import.module,state:0
+msgid "init"
+msgstr ""