[MERGE]: Merge with latest trunk-addons

bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5

15 files changed, 29 insertions, 29 deletions

diff --git a/addons/import_base/i18n/ar.po b/addons/import_base/i18n/ar.po
index e215082ef1d..f900f0fb189 100644
--- a/addons/import_base/i18n/ar.po
+++ b/addons/import_base/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/de.po b/addons/import_base/i18n/de.po
index 36463528e80..927a06628a0 100644
--- a/addons/import_base/i18n/de.po
+++ b/addons/import_base/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/es_CR.po b/addons/import_base/i18n/es_CR.po
index 5b5687f0271..4fdfd729a2d 100644
--- a/addons/import_base/i18n/es_CR.po
+++ b/addons/import_base/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/fi.po b/addons/import_base/i18n/fi.po
index 65fb1d22196..3b4db1223d9 100644
--- a/addons/import_base/i18n/fi.po
+++ b/addons/import_base/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/fr.po b/addons/import_base/i18n/fr.po
index 9a90c27d4a7..bf94c953323 100644
--- a/addons/import_base/i18n/fr.po
+++ b/addons/import_base/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/ja.po b/addons/import_base/i18n/ja.po
index 74affb0cbae..0744b46ad06 100644
--- a/addons/import_base/i18n/ja.po
+++ b/addons/import_base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/nl.po b/addons/import_base/i18n/nl.po
index a3350bbb588..7ade4bf3173 100644
--- a/addons/import_base/i18n/nl.po
+++ b/addons/import_base/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/pl.po b/addons/import_base/i18n/pl.po
index 66e79c0644b..fa3e90dc555 100644
--- a/addons/import_base/i18n/pl.po
+++ b/addons/import_base/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/pt.po b/addons/import_base/i18n/pt.po
index 14b6018152a..8baa0309054 100644
--- a/addons/import_base/i18n/pt.po
+++ b/addons/import_base/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/pt_BR.po b/addons/import_base/i18n/pt_BR.po
index d69635efabe..2a6f49957be 100644
--- a/addons/import_base/i18n/pt_BR.po
+++ b/addons/import_base/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/ro.po b/addons/import_base/i18n/ro.po
index 9d341ea2ee0..2fb6ac74e65 100644
--- a/addons/import_base/i18n/ro.po
+++ b/addons/import_base/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/sv.po b/addons/import_base/i18n/sv.po
index 467ec82ce70..058d87b1e68 100644
--- a/addons/import_base/i18n/sv.po
+++ b/addons/import_base/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/tr.po b/addons/import_base/i18n/tr.po
index 27529760793..b7b874132b9 100644
--- a/addons/import_base/i18n/tr.po
+++ b/addons/import_base/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/i18n/zh_CN.po b/addons/import_base/i18n/zh_CN.po
index 404ef65f48d..1982d1476ce 100644
--- a/addons/import_base/i18n/zh_CN.po
+++ b/addons/import_base/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
 
 #. module: import_base
 #: code:addons/import_base/import_framework.py:434
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
index 8bcda79c64e..74d2185b57e 100644
--- a/addons/import_base/import_framework.py
+++ b/addons/import_base/import_framework.py
@@ -186,7 +186,7 @@ class import_framework(Thread):
 
         model_obj = self.obj.pool.get(model)
         if not model_obj:
-            raise ValueError(_("%s is not a valid model name") % model)
+            raise ValueError(_("%s is not a valid model name.") % model)
         _logger.debug(_(" fields imported : ") + str(fields))
         (p, r, warning, s) = model_obj.import_data(self.cr, self.uid, fields, res, mode='update', current_module=self.module_name, noupdate=True, context=self.context)
         for (field, field_name) in self_dependencies: