[MERGE] mail.alias implementation + mrp.repair improvement + placeholders review + misc bits

Attempt to fix previous fp-style merge breaking weeks
of history. Unfortunately this one will swallow a few
extra merges on top of the mail.alias merge, as well
as a few odd commits

bzr revid: odo@openerp.com-20120807093802-f20mfq8a42rp84wp

13 files changed, 26 insertions, 26 deletions

diff --git a/addons/plugin/i18n/ar.po b/addons/plugin/i18n/ar.po
index 3f276b68d53..d84383a6e25 100644
--- a/addons/plugin/i18n/ar.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/cs.po b/addons/plugin/i18n/cs.po
index 2b4796774d5..ccfa49bff6e 100644
--- a/addons/plugin/i18n/cs.po
+++ b/addons/plugin/i18n/cs.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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/de.po b/addons/plugin/i18n/de.po
index 9957c24081e..83b630139de 100644
--- a/addons/plugin/i18n/de.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/es_CR.po b/addons/plugin/i18n/es_CR.po
index 5ce2a3de39a..27af6678398 100644
--- a/addons/plugin/i18n/es_CR.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po
index a03326717ff..f474abe5cd2 100644
--- a/addons/plugin/i18n/fi.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po
index 3cbf99b79e0..31cb793f828 100644
--- a/addons/plugin/i18n/fr.po
+++ b/addons/plugin/i18n/fr.po
@@ -15,8 +15,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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ja.po b/addons/plugin/i18n/ja.po
index a213e976987..7c1222af5ae 100644
--- a/addons/plugin/i18n/ja.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/nl.po b/addons/plugin/i18n/nl.po
index b09b0aa7adb..a287af98767 100644
--- a/addons/plugin/i18n/nl.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt.po b/addons/plugin/i18n/pt.po
index b47574e5e40..d158a29d97e 100644
--- a/addons/plugin/i18n/pt.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt_BR.po b/addons/plugin/i18n/pt_BR.po
index 20eb0bf2089..b24131afbbb 100644
--- a/addons/plugin/i18n/pt_BR.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ro.po b/addons/plugin/i18n/ro.po
index da3e1216540..d5fc79dc164 100644
--- a/addons/plugin/i18n/ro.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
index b7fbcfc5451..d76e39976ef 100644
--- a/addons/plugin/i18n/sv.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/zh_CN.po b/addons/plugin/i18n/zh_CN.po
index 6c915adb541..04944f01ff9 100644
--- a/addons/plugin/i18n/zh_CN.po
+++ b/addons/plugin/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-07-14 06:27+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler