[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q

1 files changed, 2 insertions, 32 deletions

diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index ff0233dce73..7e805fb28bf 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.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-11-18 16:11:48+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:48+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43:18+0000\n"
+"PO-Revision-Date: 2010-12-03 15:43:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,16 +21,6 @@ msgid "City"
 msgstr ""
 
 #. module: base_setup
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base_setup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
 msgstr ""
@@ -46,11 +36,6 @@ msgid "E-mail"
 msgstr ""
 
 #. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
 msgstr ""
@@ -175,11 +160,6 @@ msgid "Knowledge Management"
 msgstr ""
 
 #. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: base_setup
 #: help:base.setup.installer,product_expiry:0
 msgid "Installs a preselected set of OpenERP applications which will help you manage your industry."
 msgstr ""
@@ -210,11 +190,6 @@ msgid "Allows you to create your invoices and track the payments. It is an easie
 msgstr ""
 
 #. module: base_setup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
 msgstr ""
@@ -432,8 +407,3 @@ msgstr ""
 msgid "base.setup.config"
 msgstr ""
 
-#. module: base_setup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-