[MERGE] Merge with dev-addons3

bzr revid: psi@tinyerp.co.in-20110111054854-r0vcbz78osgi04k0
bzr revid: psi@tinyerp.co.in-20110111095709-fhx2itxkzc7ke838
bzr revid: psi@tinyerp.co.in-20110111100412-vm3ychib79v2fy10

3 files changed, 13 insertions, 10 deletions

diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 7e1b1d03b2c..7c7e394c6ae 100755
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-12-27 09:12+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-01-10 11:47+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-06 05:25+0000\n"
+"X-Launchpad-Export-Date: 2011-01-11 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -57,6 +56,8 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:97
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 7524b0a5656..e28e1206cc6 100755
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-01 07:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-10 16:13+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-06 05:25+0000\n"
+"X-Launchpad-Export-Date: 2011-01-11 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -56,6 +56,8 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"Errore! La valuta deve essere uguale a quella impostata per l'azienda "
+"selezionata"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:97
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 33d2a550d8a..ea9d030c7cf 100755
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-03 18:20+0000\n"
-"Last-Translator: badralb <Unknown>\n"
+"PO-Revision-Date: 2011-01-11 03:25+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2011-01-06 05:25+0000\n"
+"X-Launchpad-Export-Date: 2011-01-11 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function