[MERGE]: Merged with trunk-addons.

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

1 files changed, 23 insertions, 43 deletions

diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index 16b98b001ec..b3a2358809d 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.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:12:58+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:58+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44:21+0000\n"
+"PO-Revision-Date: 2010-12-03 15:44:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,8 @@ msgid "Group By..."
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
-msgid "Resources"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_long_term
@@ -71,11 +64,21 @@ msgid "Schedule"
 msgstr ""
 
 #. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr ""
 
 #. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "Day"
@@ -177,16 +180,6 @@ msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr ""
-
-#. module: project_long_term
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
 msgstr ""
@@ -203,11 +196,6 @@ msgid "Compute Scheduling of phases for all or specified project"
 msgstr ""
 
 #. module: project_long_term
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
 msgstr ""
@@ -236,6 +224,13 @@ msgid "Compute Scheduling of Task"
 msgstr ""
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
 msgid "To schedule phases of all or a specified project. It then open a gantt view.\n"
 "	           "
@@ -252,8 +247,8 @@ msgid "Related Tasks"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: view:project.phase:0
+msgid "Dates"
 msgstr ""
 
 #. module: project_long_term
@@ -319,11 +314,6 @@ msgid "Draft"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
 msgid "A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it."
 msgstr ""
@@ -415,22 +405,12 @@ msgid "Cancel"
 msgstr ""
 
 #. module: project_long_term
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
 msgstr ""