[MERGE] merged with main addons branch

bzr revid: qdp-launchpad@tinyerp.com-20101124143932-y7wn0ccc8ou23751

1 files changed, 18 insertions, 11 deletions

diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index fe37af8289b..44cbc5e46f2 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46:06+0000\n"
-"PO-Revision-Date: 2010-10-18 17:46:06+0000\n"
+"POT-Creation-Date: 2010-11-18 16:11:23+0000\n"
+"PO-Revision-Date: 2010-11-18 16:11:23+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: analytic_user_function
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr ""
+
+#. module: analytic_user_function
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
@@ -48,10 +53,8 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid "There is no expense account define ' \\n"
-"                                    'for this product: \"%s\" (id:%d)"
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: analytic_user_function
@@ -66,6 +69,12 @@ msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
@@ -76,10 +85,8 @@ msgid "Analytic User Function"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
-#, python-format
-msgid "There is no expense account define ' \\n"
-"                                'for this product: \"%s\" (id:%d)"
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
 msgstr ""
 
 #. module: analytic_user_function