[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20101216051418-j6s2cj2w26c5yv6m

3 files changed, 10 insertions, 10 deletions

diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index 2e107e18b3c..fde40a298a6 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:57+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:57+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 8b77ce01458..5a787884851 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 09:32+0000\n"
+"PO-Revision-Date: 2010-12-15 20:30+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.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: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -67,12 +67,12 @@ msgstr ""
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Fonction utilisateur analytique"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index 789266f6149..167d55812c6 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-11-27 05:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 10:04+0000\n"
+"Last-Translator: Simon Vidmar <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: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -63,7 +63,7 @@ msgstr "Tabela odnosov med uporabniki in produkti na analitičnem kontu"
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information