[Merge]: Merge from trunk.

bzr revid: rch@tinyerp.com-20101119134029-g7s9fotsw59mx9ww

2 files changed, 68 insertions, 34 deletions

diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index 9551397a038..ff0233dce73 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.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:19+0000\n"
-"PO-Revision-Date: 2010-10-18 17:46:19+0000\n"
+"POT-Creation-Date: 2010-11-18 16:11:48+0000\n"
+"PO-Revision-Date: 2010-11-18 16:11:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,6 +46,11 @@ 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 ""
@@ -91,8 +96,10 @@ msgid "Helps you handle your accounting needs, if you are not an accountant, we
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "You can start configuring the system or connect directly to the database as an administrator."
+#: code:addons/base_setup/__init__.py:0
+#, python-format
+msgid "The following users have been installed : \n"
+""
 msgstr ""
 
 #. module: base_setup
@@ -138,6 +145,11 @@ msgid "Lets you install various interesting but non-essential tools like Survey,
 msgstr ""
 
 #. module: base_setup
+#: view:base.setup.config:0
+msgid "You can start configuring the system or connect directly to the database as an administrator."
+msgstr ""
+
+#. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
 msgstr ""
@@ -158,13 +170,13 @@ msgid "title"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Use Directly"
+#: field:base.setup.installer,knowledge:0
+msgid "Knowledge Management"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
 msgstr ""
 
 #. module: base_setup
@@ -183,6 +195,11 @@ msgid "Helps you get the most out of your points of sales with fast sale encodin
 msgstr ""
 
 #. module: base_setup
+#: view:base.setup.config:0
+msgid "Skip Configuration Wizards"
+msgstr ""
+
+#. module: base_setup
 #: help:base.setup.installer,hr:0
 msgid "Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."
 msgstr ""
@@ -416,8 +433,7 @@ msgid "base.setup.config"
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:0
-#, python-format
-msgid "The following users have been installed : \n"
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
 msgstr ""
 
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 480cd3c5753..333dede9a2c 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-11 08:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"PO-Revision-Date: 2010-11-18 11:50+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-19 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
 msgid "City"
-msgstr "Plaats"
+msgstr "Woonplaats"
 
 #. module: base_setup
 #: constraint:ir.model:0
@@ -49,9 +49,14 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. 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 "Bank Rekening Nr"
+msgstr "Bankrekening Nr"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -102,13 +107,10 @@ msgstr ""
 "om alleen de facturatie te installeren "
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
-msgstr ""
-"U kunt beginnen met de configuratie van het systeem of direct verbinden met "
-"de database als beheerder."
+#: code:addons/base_setup/__init__.py:0
+#, python-format
+msgid "The following users have been installed : \n"
+msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
@@ -157,6 +159,15 @@ msgstr ""
 "enquête, lunch en ideeënbus installeren."
 
 #. module: base_setup
+#: view:base.setup.config:0
+msgid ""
+"You can start configuring the system or connect directly to the database as "
+"an administrator."
+msgstr ""
+"U kunt beginnen met de configuratie van het systeem of direct verbinden met "
+"de database als beheerder."
+
+#. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
 msgstr "Geavanceerde overzichten"
@@ -177,16 +188,16 @@ msgid "title"
 msgstr "titel"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Use Directly"
-msgstr "Direct Gebruiken"
-
-#. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
 msgstr "Kennisbeheer"
 
 #. 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 "
@@ -215,6 +226,11 @@ msgstr ""
 "betaalmethode codering, automatische piklijst generatie en meer."
 
 #. module: base_setup
+#: view:base.setup.config:0
+msgid "Skip Configuration Wizards"
+msgstr ""
+
+#. module: base_setup
 #: help:base.setup.installer,hr:0
 msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
@@ -499,10 +515,9 @@ msgid "base.setup.config"
 msgstr "base.setup.config"
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:0
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr ""
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -568,6 +583,9 @@ msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
 #~ msgid "Installation Done"
 #~ msgstr "Installatie Gereed"
 
+#~ msgid "Use Directly"
+#~ msgstr "Direct Gebruiken"
+
 #~ msgid "Cancel"
 #~ msgstr "Annuleren"