[Merge]: Merge from trunk.

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

2 files changed, 37 insertions, 8 deletions

diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index f79815e13a8..43947485e00 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -6,15 +6,14 @@ 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-08 08:26+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"PO-Revision-Date: 2010-11-18 21:32+0000\n"
+"Last-Translator: Carlos @ smile.fr <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-09 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-11-19 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -38,6 +37,11 @@ msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: process
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#. module: process
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
@@ -149,6 +153,11 @@ msgid "Workflow Transitions"
 msgstr "Transiciones flujo de trabajo"
 
 #. module: process
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "¡El nombre del módulo debe ser único!"
+
+#. module: process
 #: field:process.transition.action,action:0
 msgid "Action ID"
 msgstr "ID de la acción"
@@ -337,6 +346,11 @@ msgstr "Transiciones"
 msgid "Object Method"
 msgstr "Método objeto"
 
+#. module: process
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
 #~ msgid "Roles from Workflow"
 #~ msgstr "Roles desde flujo"
 
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index 667f337fe24..89156cc4833 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.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:45+0000\n"
-"PO-Revision-Date: 2010-10-18 17:46:45+0000\n"
+"POT-Creation-Date: 2010-11-18 16:12:49+0000\n"
+"PO-Revision-Date: 2010-11-18 16:12:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,11 @@ msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: process
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr ""
+
+#. module: process
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
@@ -141,6 +146,11 @@ msgid "Workflow Transitions"
 msgstr ""
 
 #. module: process
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr ""
+
+#. module: process
 #: field:process.transition.action,action:0
 msgid "Action ID"
 msgstr ""
@@ -329,3 +339,8 @@ msgstr ""
 msgid "Object Method"
 msgstr ""
 
+#. module: process
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr ""
+