Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0

14 files changed, 3285 insertions, 3273 deletions

diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index d929802b2ed..7fb59a10ac8 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-08-17 23:04+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Gestió de projectes a llarg plaç"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Calcula la planificació de fases"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,17 +34,22 @@ msgid "Project's Tasks"
 msgstr "Tasques del projecte"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fases"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Agrupa per..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
@@ -57,10 +57,9 @@ msgstr ""
 "projecte."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Assignació de recursos"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -73,73 +72,43 @@ msgid "Schedule"
 msgstr "Horari"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Mòdul de Gestió de Projectes a llarg termini que realitza el "
-"seguiment de planejament, programació, assignació de recursos.\n"
-"        Utilitzat principalment amb la gestió de projectes grans.\n"
-"            - Les Fases del Projecte seran gestionades per l'Administrador "
-"del projecte\n"
-"            - Calcula la Programació de Fases: Calcula la data d'inici i "
-"data de finalització de les fases del projecte en estat esborrador, obert i "
-"pendent.\n"
-"                                        Si no hi ha cap projecte concret, "
-"llavors es portaran totes les fases en estat esborrador, obert i pendent\n"
-"            - Calcula la Programació de Tasques: Això funciona igual que el "
-"botó programador de project.phase. Pren el projecte com a argument i calcula "
-"totes les tasques obertes, en esborrany i pendents.\n"
-"            - Programa tasques: Totes les tasques en estat esborrador, "
-"pendent i obert es programen des de la data d'inici de la fase\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Assignació de recursos"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Dia"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Tasca"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Calcular un sol projecte"
@@ -156,6 +125,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "UdM (Unitat de Mesura) és la unitat de mesura per la durada"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -167,14 +144,14 @@ msgstr " És calculat pel planificador d'acord a la data d'inici i la durada."
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projecte"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Error!"
@@ -185,44 +162,36 @@ msgid "Cancelled"
 msgstr "Cancel·lada"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Data de finalització"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planificació"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Data limit"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Canceŀla"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Calcula planificació de fases"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (còpia)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Disponibilitat"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -237,9 +206,15 @@ msgid "C_ompute"
 msgstr "C_alcula"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Calcula planificació de fases per tots o el projecte especificat"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -247,49 +222,23 @@ msgid "Duration UoM"
 msgstr "UdM duració"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Calcula planificació de tasques"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Data d'inici mínima"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Assignació de recursos del projecte"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Calcula planificació de tasques"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Recursos"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Per programar les fases de tots els projectes, o un d'específic. A "
-"continuació, obrirà una vista de Gantt.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Data d'inici"
 
@@ -300,16 +249,14 @@ msgstr "Tasques relacionades"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Dates"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"La disponibilitat d'aquest recurs per aquesta fase del projecte en "
-"percentatge (= 50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -322,21 +269,6 @@ msgid "Project Tasks"
 msgstr "Tasques de projecte"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Recursos del projecte"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_D'acord"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Planifica i mostra informació"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -357,78 +289,50 @@ msgstr ""
 "La data d'inici de la fase ha de ser anterior a la data de finalització."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "projecte.planifica.tasques"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Un projecte es pot dividir en diferents fases. Per a cada fase, podeu "
-"definir la seva assignació de recursos, descriure diferents tasques i "
-"vincular la seva fase a fases prèvies i posteriors, afegir restriccions de "
-"data per a la programació automàtica. Quan comenceu a treballar en el "
-"projecte, utilitzeu el planejament a llarg termini per planificar els seus "
-"recursos humans disponibles i convertir les seves fases en una sèrie de "
-"tasques."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Data d'inici"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Asignació de recursos"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "Força que la fase acabi abans d'aquesta data"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Pendent"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "desconegut"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Usuari"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Detall de la tasca"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-"Hores de treball de l'horari per a ajustar l'informe del diagrama de Gantt"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Calcula tasques del projecte"
@@ -476,21 +380,22 @@ msgid "Remaining Hours"
 msgstr "Hores restants"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Responsable"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Error ! La data final de la tasca ha de ser major que la data d'inici"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Horari de treball"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Actiu"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -498,29 +403,17 @@ msgid "Start Phase"
 msgstr "Comença fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Si us plau seleccioneu el projecte a planificar"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Total d'hores"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Planificació de tasques completada satisfactòriament."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Calcula planificació de tasques per al projecte específic"
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Fase"
 
@@ -541,17 +434,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Data final"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Recurs"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nom"
@@ -562,40 +449,38 @@ msgid "Tasks Details"
 msgstr "Detalls de tasques"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Horari laboral"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Detall del recurs"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Durada"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Planificació"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Fase del projecte"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Cerca fases del projecte"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Missatge"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "No es permeten bucles en les fases"
@@ -606,19 +491,14 @@ msgid "Sequence"
 msgstr "Seqüència"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Calcula tots els projectes"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Absències de recursos"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Planifica tasques"
 
@@ -628,6 +508,132 @@ msgid "By default in days"
 msgstr "Per defecte en dies"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Durada"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Planificació"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Assignació de recursos"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Calcula la planificació de fases"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Gestió de projectes a llarg plaç"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Assignació de recursos"
+
+#~ msgid "Planning"
+#~ msgstr "Planificació"
+
+#~ msgid "Availability"
+#~ msgstr "Disponibilitat"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Calcula planificació de fases"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Per programar les fases de tots els projectes, o un d'específic. A "
+#~ "continuació, obrirà una vista de Gantt.\n"
+#~ "\t           "
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Calcula planificació de fases per tots o el projecte especificat"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Calcula planificació de tasques"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Calcula planificació de tasques"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Assignació de recursos del projecte"
+
+#~ msgid "Dates"
+#~ msgstr "Dates"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Asignació de recursos"
+
+#~ msgid "Task Detail"
+#~ msgstr "Detall de la tasca"
+
+#~ msgid "Responsible"
+#~ msgstr "Responsable"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Si us plau seleccioneu el projecte a planificar"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Planificació de tasques completada satisfactòriament."
+
+#~ msgid "Resource"
+#~ msgstr "Recurs"
+
+#~ msgid "Message"
+#~ msgstr "Missatge"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Calcula tots els projectes"
+
+#~ msgid "Project Resources"
+#~ msgstr "Recursos del projecte"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Planifica i mostra informació"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "projecte.planifica.tasques"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "La disponibilitat d'aquest recurs per aquesta fase del projecte en "
+#~ "percentatge (= 50%)"
+
+#~ msgid "_Ok"
+#~ msgstr "_D'acord"
+
+#~ msgid "unknown"
+#~ msgstr "desconegut"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Calcula planificació de tasques per al projecte específic"
+
+#~ msgid "Current"
+#~ msgstr "Actiu"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr ""
+#~ "Hores de treball de l'horari per a ajustar l'informe del diagrama de Gantt"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Detall del recurs"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Un projecte es pot dividir en diferents fases. Per a cada fase, podeu "
+#~ "definir la seva assignació de recursos, descriure diferents tasques i "
+#~ "vincular la seva fase a fases prèvies i posteriors, afegir restriccions de "
+#~ "data per a la programació automàtica. Quan comenceu a treballar en el "
+#~ "projecte, utilitzeu el planejament a llarg termini per planificar els seus "
+#~ "recursos humans disponibles i convertir les seves fases en una sèrie de "
+#~ "tasques."
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index 9233ca1c1fe..51373aab108 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-12 18:37+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,18 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Management von Langzeit Projekten"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Berechne Projektphasen"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Phasen"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,26 +34,30 @@ msgid "Project's Tasks"
 msgstr "Projekt Aufgaben"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Phasen"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Gruppierung..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Ressourcenaufteilung"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -71,76 +70,43 @@ msgid "Schedule"
 msgstr "Zeitplanung"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Das Projekt Management Module von Langzeit Projekten umfasst die "
-"zeitliche Planung, Planung, Terminierung sowie Zuweisung von (Personal-) "
-"Ressourcen.\n"
-"        Hauptsächlich wird es in grösseren Langzeit - Projekten benötigt.\n"
-"            - Projekt Phasen werden durch den Projektmanager erstellt und "
-"gemanagt.\n"
-"            - Berechnung der Terminierung v. Projektphasen:  Berechnung von "
-"Start und Ende Datum der Phasen die durch die verschiedenen Stadien Entwurf, "
-"Offen oder Im Wartezustand gekennzeichnet sind.\n"
-"       Wenn kein bestimmtes Projekt vorgegeben ist, werden nur die Stadien "
-"Entwurf, Offen, Im Wartezustand herangezogen.\n"
-"            - Berechnung der Aufgaben Terminierung: Dieses funktioniert in "
-"gleicher Weise wie der Klick auf den Button bei den einzelnen Projektphasen. "
-"Herangezogen wird das Projekt als solches, berechnet werden alle Aufgaben "
-"der Stadien Offen,Entwurf und Im Wartezustand.\n"
-"            - Terminiere Aufgaben: Alle Aufgaben in den Stadien Entwurf, Im "
-"Wartezustand und Offen werden ausgehend vom Start Datum der Phasen "
-"berechnet.\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Zuweisung Ressourcen"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Tag"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Aufgabe"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Berechne Einzelprojekt"
@@ -157,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "ME (Mengeneinheit) entspr. Einheit für die Dauer"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -170,14 +144,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projekt"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Fehler!"
@@ -188,44 +162,36 @@ msgid "Cancelled"
 msgstr "Abgebrochen"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Ende Datum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planung"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Frist"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "Abbrechen"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Berechne Terminierung der Phasen"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (Kopie)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Verfügbarkeit"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -240,9 +206,15 @@ msgid "C_ompute"
 msgstr "Berechne"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Berechne Terminierung aller Phasen für das spezifizierte Projekt"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -250,49 +222,23 @@ msgid "Duration UoM"
 msgstr "Dauer ME"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Berechne Terminierung für Aufgaben"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Frühestes Startdatum"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Zuweisung Projekt Ressource"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Berechne Aufgabenterminierung"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Ressourcen"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Zur Berechnung aller Phasen für das spezifizierte Projekt. Es wird ein Gantt "
-"Chart zur Planung geöffnet.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Start Datum"
 
@@ -303,15 +249,14 @@ msgstr "Verknüpfte Aufgaben"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Daten"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"Verfügbarkeit dieser Ressource für diese Projektphase in Prozent (=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -324,21 +269,6 @@ msgid "Project Tasks"
 msgstr "Projekt Aufgaben"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Projekt Ressourcen"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "OK"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Info Planungsassistent und Anzeige"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -358,78 +288,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "Start Datum der Phase muss vor dem Ende Datum sein."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Ein Projekt kann in verschiedene Phasen aufgeteilt werden. Für jede Phase "
-"können Sie zur automatischen Terminierung die Ressourcenaufteilung "
-"definieren, Aufgaben beschreiben und die Phase sowohl mit vorhergehenden als "
-"auch nachfolgenden Phasen verknüpfen oder Bedingungen für feste Termine "
-"hinterlegen. Benutzen Sie das Modul Planung für Langzeitprojekte zur "
-"langfristigen Planung und Aufteilung verfügbarer Personalressourcen. "
-"Konvertieren Sie die Phasen in konkrete Aufgabenlisten, wenn Sie die "
-"Bearbeitung der Phasen eröffnen."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Start Datum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Zuweisung Ressourcen"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "erzwinge Ende der Periode vor"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Unerledigt"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "unbekannt"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Benutzer"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Aufgaben Detail"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Zeiterfassung Arbeitsstunden für die Ausrichtung des Gantt Charts"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Berechnung Aufgaben f. Projekt"
@@ -477,21 +379,21 @@ msgid "Remaining Hours"
 msgstr "Verbleib. Stunden"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Verantwortlicher"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Arbeitszeit"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Aktuell"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -499,30 +401,17 @@ msgid "Start Phase"
 msgstr "Start der Phase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr ""
-"Bitte spezifizieren Sie ein Projekt für die automatische Terminierung"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Gesamte Stunden"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Aufgaben Planung wurde erfolgreich vervollständigt."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Berechne Aufgabenterminierung für spezifiziertes Projekt."
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Phase"
 
@@ -543,17 +432,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Ende Datum"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Ressource"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Bezeichnung"
@@ -564,40 +447,38 @@ msgid "Tasks Details"
 msgstr "Aufgabendetails"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Arbeitszeitmodell"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Ressource Detail"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Dauer"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Terminierung"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Projekt Phase"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Berechne Projekt Phasen"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Nachricht"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Wiederkehrende Phasen sind nicht möglich"
@@ -608,19 +489,14 @@ msgid "Sequence"
 msgstr "Reihenfolge"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Berechne Alle Projekte"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Ressource Abwesenheit"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Berechne Aufgaben"
 
@@ -630,6 +506,132 @@ msgid "By default in days"
 msgstr "Gem. Standard in Tagen"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Dauer"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Terminierung"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Berechne Projektphasen"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Zuweisung Ressourcen"
+
+#~ msgid "Planning"
+#~ msgstr "Planung"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Berechne Terminierung der Phasen"
+
+#~ msgid "Dates"
+#~ msgstr "Daten"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Berechne Terminierung für Aufgaben"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Zuweisung Projekt Ressource"
+
+#~ msgid "Project Resources"
+#~ msgstr "Projekt Ressourcen"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Zuweisung Ressourcen"
+
+#~ msgid "Task Detail"
+#~ msgstr "Aufgaben Detail"
+
+#~ msgid "Responsible"
+#~ msgstr "Verantwortlicher"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Aufgaben Planung wurde erfolgreich vervollständigt."
+
+#~ msgid "Resource"
+#~ msgstr "Ressource"
+
+#~ msgid "Message"
+#~ msgstr "Nachricht"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Berechne Alle Projekte"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Management von Langzeit Projekten"
+
+#~ msgid "_Ok"
+#~ msgstr "OK"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr ""
+#~ "Bitte spezifizieren Sie ein Projekt für die automatische Terminierung"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Ressourcenaufteilung"
+
+#~ msgid "Availability"
+#~ msgstr "Verfügbarkeit"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Berechne Terminierung aller Phasen für das spezifizierte Projekt"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Zur Berechnung aller Phasen für das spezifizierte Projekt. Es wird ein Gantt "
+#~ "Chart zur Planung geöffnet.\n"
+#~ "\t           "
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "Verfügbarkeit dieser Ressource für diese Projektphase in Prozent (=50%)"
+
+#~ msgid "unknown"
+#~ msgstr "unbekannt"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "Zeiterfassung Arbeitsstunden für die Ausrichtung des Gantt Charts"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Berechne Aufgabenterminierung"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Ressource Detail"
+
+#~ msgid "Current"
+#~ msgstr "Aktuell"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Berechne Aufgabenterminierung für spezifiziertes Projekt."
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Info Planungsassistent und Anzeige"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Ein Projekt kann in verschiedene Phasen aufgeteilt werden. Für jede Phase "
+#~ "können Sie zur automatischen Terminierung die Ressourcenaufteilung "
+#~ "definieren, Aufgaben beschreiben und die Phase sowohl mit vorhergehenden als "
+#~ "auch nachfolgenden Phasen verknüpfen oder Bedingungen für feste Termine "
+#~ "hinterlegen. Benutzen Sie das Modul Planung für Langzeitprojekte zur "
+#~ "langfristigen Planung und Aufteilung verfügbarer Personalressourcen. "
+#~ "Konvertieren Sie die Phasen in konkrete Aufgabenlisten, wenn Sie die "
+#~ "Bearbeitung der Phasen eröffnen."
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index e89ed4db05a..3fbecaab602 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-18 09:17+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Gestión de proyectos a largo plazo"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Calcular planificación de fases"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,17 +34,22 @@ msgid "Project's Tasks"
 msgstr "Tareas del proyecto"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fases"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
@@ -57,10 +57,9 @@ msgstr ""
 "del proyecto."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Asignación de recursos"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -73,74 +72,43 @@ msgid "Schedule"
 msgstr "Programa"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Módulo de Gestión de Proyectos a Largo Plazo que realiza el "
-"seguimiento de planeamiento, programación, asignación de recursos.\n"
-"        Utilizado principalmente con la gestión de proyectos grandes.\n"
-"            - Las Fases del Proyecto serán gestionadas por el Administrador "
-"del proyecto\n"
-"            - Calcula la Programación de Fases: Calcula la fecha de inicio y "
-"fecha de finalización de las fases del proyecto en estado borrador, abierto "
-"y pendiente.\n"
-"                                       Si no hay ningún proyecto concreto, "
-"entonces se llevarán todas las fases en estado borrador, abierto y "
-"pendiente\n"
-"            - Calcula la Programación de Tareas: Esto funciona igual que el "
-"botón programador de project.phase. Toma el proyecto como argumento y "
-"calcula todas las tareas abiertas, en borrador y pendientes.\n"
-"            - Programa tareas: Todas las tareas en estado borrador, "
-"pendiente y abierto se programan desde la fecha de inicio de la fase\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "¡Error! No se pueden crear tareas recursivas."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Asignación de recursos"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Día"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Tarea"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Calcular un sólo proyecto"
@@ -157,6 +125,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -170,14 +146,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Proyecto"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -188,44 +164,36 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Fecha de fin"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Calcular planificación de fases"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Disponibilidad"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -240,10 +208,15 @@ msgid "C_ompute"
 msgstr "C_alcular"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
 msgstr ""
-"Calcular planificación de fases para todos o el proyecto especificado"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -251,49 +224,23 @@ msgid "Duration UoM"
 msgstr "UdM duración"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Calcular planificación de tareas"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Fecha de inicio mínima"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Asignación de recursos de proyecto"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Calcular planificación de tarea"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Recursos"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Para programar las fases de todos los proyectos, o uno específico. A "
-"continuación, abrirá una vista de Gantt.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Fecha de inicio"
 
@@ -304,16 +251,14 @@ msgstr "Tareas relacionadas"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Fechas"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"La disponibilidad de este recurso para esta fase de proyecto en porcentaje "
-"(=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -326,21 +271,6 @@ msgid "Project Tasks"
 msgstr "Tareas de proyecto"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Recursos de proyecto"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_Aceptar"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Planificar y mostrar información"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -360,76 +290,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "La fecha-inicio de la fase debe ser anterior a la fecha-fin."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "proyecto.planificar.tareas"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Un proyecto se puede dividir en diferentes fases. Para cada fase, puede "
-"definir su asignación de recursos, describir diferentes tareas y vincular su "
-"fase a fases previas y posteriores, añadir restricciones de fecha para la "
-"programación automática. Cuando empiece a trabajar en el proyecto, use el "
-"planeamiento a largo plazo para planificar sus recursos humanos disponibles "
-"y convertir sus fases en una serie de tareas."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Fecha inicio"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Asignación de recursos"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "Forzar que la fase termine antes de esta fecha"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "desconocido"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Detalles tarea"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Horario de trabajo para ajustar el informe del diagrama de Gantt"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Calcular tareas proyecto"
@@ -477,21 +381,22 @@ msgid "Remaining Hours"
 msgstr "Horas restantes"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Responsable"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Horario de trabajo"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Actual"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -499,29 +404,17 @@ msgid "Start Phase"
 msgstr "Comenzar fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Por favor seleccione el proyecto a planificar"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Total horas"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Planificación de tareas completada satisfactoriamente."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Calcular planificación de tareas para un proyecto específico"
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Fase"
 
@@ -541,17 +434,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Fecha de fin"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Recurso"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -562,40 +449,38 @@ msgid "Tasks Details"
 msgstr "Detalles tareas"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Periodo de trabajo"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Detalle recurso"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duración"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Planificación"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Fase proyecto"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Calcular fases del proyecto"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Mensaje"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "No se permiten bucles en fases"
@@ -606,19 +491,14 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Calcular todos los proyectos"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Ausencias recursos"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Planificar tareas"
 
@@ -628,6 +508,131 @@ msgid "By default in days"
 msgstr "Por defecto en días"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Duración"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Planificación"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Asignación de recursos"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Gestión de proyectos a largo plazo"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Calcular planificación de fases"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Asignación de recursos"
+
+#~ msgid "Planning"
+#~ msgstr "Planificación"
+
+#~ msgid "Availability"
+#~ msgstr "Disponibilidad"
+
+#~ msgid "Project Resources"
+#~ msgstr "Recursos de proyecto"
+
+#~ msgid "_Ok"
+#~ msgstr "_Aceptar"
+
+#~ msgid "Dates"
+#~ msgstr "Fechas"
+
+#~ msgid "unknown"
+#~ msgstr "desconocido"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Asignación de recursos"
+
+#~ msgid "Task Detail"
+#~ msgstr "Detalles tarea"
+
+#~ msgid "Current"
+#~ msgstr "Actual"
+
+#~ msgid "Responsible"
+#~ msgstr "Responsable"
+
+#~ msgid "Resource"
+#~ msgstr "Recurso"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Detalle recurso"
+
+#~ msgid "Message"
+#~ msgstr "Mensaje"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Calcular todos los proyectos"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr ""
+#~ "Calcular planificación de fases para todos o el proyecto especificado"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Calcular planificación de tarea"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Calcular planificación de fases"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Calcular planificación de tareas"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Asignación de recursos de proyecto"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "La disponibilidad de este recurso para esta fase de proyecto en porcentaje "
+#~ "(=50%)"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Planificar y mostrar información"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "Horario de trabajo para ajustar el informe del diagrama de Gantt"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Calcular planificación de tareas para un proyecto específico"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Por favor seleccione el proyecto a planificar"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Planificación de tareas completada satisfactoriamente."
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Para programar las fases de todos los proyectos, o uno específico. A "
+#~ "continuación, abrirá una vista de Gantt.\n"
+#~ "\t           "
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Un proyecto se puede dividir en diferentes fases. Para cada fase, puede "
+#~ "definir su asignación de recursos, describir diferentes tareas y vincular su "
+#~ "fase a fases previas y posteriores, añadir restricciones de fecha para la "
+#~ "programación automática. Cuando empiece a trabajar en el proyecto, use el "
+#~ "planeamiento a largo plazo para planificar sus recursos humanos disponibles "
+#~ "y convertir sus fases en una serie de tareas."
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "proyecto.planificar.tareas"
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index a19e02be3af..b3967b075c6 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-12 15:37+0000\n"
 "Last-Translator: Pekka Pylvänäinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Pitkäaikaisten projektien hallinta"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Laske vaiheiden ajoitus"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Vaiheet"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,26 +34,30 @@ msgid "Project's Tasks"
 msgstr "Projektin tehtävät"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Vaiheet"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Ryhmittely.."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Resurssien allokointi"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -71,54 +70,43 @@ msgid "Schedule"
 msgstr "Ajastus"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Resurssien allokoinnit"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Virhe! Et voi asettaa eskalointia samalle projektille!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Päivä"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Tehtävä"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Laske yksittäinen projekti"
@@ -135,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "Mittayksikkö (UoM) on keston mittayksikkö"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -146,14 +142,14 @@ msgstr " Se lasketaan ajastimella alkupäivän ja keston mukaan."
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projekti"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Virhe!"
@@ -164,44 +160,36 @@ msgid "Cancelled"
 msgstr "Peruttu"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Lopetuspäivämäärä"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Suunnittelu"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Määräaika"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Peru"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Laske vaiheen ajoitus"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (kopio)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Saatavuus"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -216,9 +204,15 @@ msgid "C_ompute"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Laske vaiheiden ajoitus kaikille tai valituille projekteille"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -226,46 +220,23 @@ msgid "Duration UoM"
 msgstr "Keston mittayksikkö"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Laske tehtävän ajoitus"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Minimi aloituspäivä"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Projektin resurssien allokointi"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Laske tehtävän ajoitus"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Resurssit"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Aloituspäivämäärä"
 
@@ -276,15 +247,14 @@ msgstr "Liittyvät tehtävät"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Päivämäärät"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"Tämän resurssin saatavuus tälle projektin vaiheelle prosentteina (=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -297,21 +267,6 @@ msgid "Project Tasks"
 msgstr "Projektin tehtävät"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Projektin resurssit"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Ajoita ja näytä tiedot"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -331,70 +286,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "Vaiheen alkupäivän tulee olla aikaisempi kuin loppupäivä."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Aloituspvm"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Resurssien allokointi"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "pakota vaihe valmistumaan ennen tätä päivää"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Luonnos"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Odottava"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "Tuntematon"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Käyttäjä"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Tehtävän yksityiskohdat"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Aikatauluta työtunnit säätääkseksi gantt diagrammin raporttia"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Laske projektin tehtävät"
@@ -442,21 +377,22 @@ msgid "Remaining Hours"
 msgstr "Jäljelläolevat tunnit"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Vastuuhenkilö"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Työaika"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Nykyinen"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -464,29 +400,17 @@ msgid "Start Phase"
 msgstr "Käynnistä vaihe"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Ole hyvä ja määrittele ajoitettava projekti"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Tunnit yhteensä"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Tehtävien ajoitus tehty onnistuneesti."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Laske tehtävän ajoitus määritellylle projektille."
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Vaihe"
 
@@ -502,17 +426,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Loppupvm"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Resurssi"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -523,40 +441,38 @@ msgid "Tasks Details"
 msgstr "Tehtävän yksityiskohdat"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Resurssin yksityiskohdat"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Kesto"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Aikataulutus"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Projektin vaihe"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Laske projektin vaiheet"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Viesti"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Vaiheissa ei sallita luuppeja"
@@ -567,19 +483,14 @@ msgid "Sequence"
 msgstr "Sekvenssi"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Laske kaikki projektit"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Resurssin lomat"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Ajoita tehtävät"
 
@@ -589,6 +500,99 @@ msgid "By default in days"
 msgstr "Oletuksena päivissä"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Kesto"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Aikataulutus"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Resurssien allokoinnit"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Resurssien allokointi"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Pitkäaikaisten projektien hallinta"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Laske vaiheiden ajoitus"
+
+#~ msgid "Planning"
+#~ msgstr "Suunnittelu"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Laske vaiheiden ajoitus kaikille tai valituille projekteille"
+
+#~ msgid "Availability"
+#~ msgstr "Saatavuus"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Laske vaiheen ajoitus"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Laske tehtävän ajoitus"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Laske tehtävän ajoitus"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Projektin resurssien allokointi"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "Tämän resurssin saatavuus tälle projektin vaiheelle prosentteina (=50%)"
+
+#~ msgid "Project Resources"
+#~ msgstr "Projektin resurssit"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Ajoita ja näytä tiedot"
+
+#~ msgid "Dates"
+#~ msgstr "Päivämäärät"
+
+#~ msgid "unknown"
+#~ msgstr "Tuntematon"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Resurssien allokointi"
+
+#~ msgid "Task Detail"
+#~ msgstr "Tehtävän yksityiskohdat"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "Aikatauluta työtunnit säätääkseksi gantt diagrammin raporttia"
+
+#~ msgid "Current"
+#~ msgstr "Nykyinen"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Ole hyvä ja määrittele ajoitettava projekti"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Tehtävien ajoitus tehty onnistuneesti."
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Laske tehtävän ajoitus määritellylle projektille."
+
+#~ msgid "Responsible"
+#~ msgstr "Vastuuhenkilö"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Resurssin yksityiskohdat"
+
+#~ msgid "Resource"
+#~ msgstr "Resurssi"
+
+#~ msgid "Message"
+#~ msgstr "Viesti"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Laske kaikki projektit"
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index d4d97674d0e..af8655fdc74 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -6,25 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-13 05:12+0000\n"
 "Last-Translator: Quentin THEURET <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: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Gestion de projets à long terme"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Calculer l'ordonnancement des phases"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Phases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -38,17 +33,22 @@ msgid "Project's Tasks"
 msgstr "Tâches du projet"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Phases"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Regrouper par..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
@@ -56,10 +56,9 @@ msgstr ""
 "projet."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Allocation des ressources"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -72,76 +71,44 @@ msgid "Schedule"
 msgstr "Planifier"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Module de gestion de projet à long terme, qui fait le suivi de la "
-"planification, de l'ordonnancement, de l'allocation des ressources.\n"
-"        Principalement utilisé pour la gestion de gros projet.\n"
-"            - Les phases du projet seront maintenues par le chef de projet\n"
-"            - Calcule l'ordonnancement des phases : calcule les dates de "
-"début et de fin des phases dans l'état brouillon, ouverte ou en attente pour "
-"un projet donné.\n"
-"                                        Si aucun projet n'est spécifié, "
-"alors toutes les phases dans l'état brouillon, ouverte et en attente seront "
-"considérées\n"
-"            - Calcule l'ordonnancement des tâches : Fonctionne de la même "
-"façon que le bouton d'ordonnancement sur les projets. Il prend le projet "
-"comme argument et calcule toutes les tâches ouvertes, en brouillon et en "
-"attente\n"
-"            - Ordonnance les tâches : Toutes les tâches dans l'état "
-"brouillon, ouverte et en attente sont planifiés avec la date de début de la "
-"phase.\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Allocations des ressources"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 "Erreur ! Vous ne pouvez pas attribuer une escalade sur le même projet !"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Jour"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Tâche"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Calculer un seul projet"
@@ -158,6 +125,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "UdM (unité de mesure) est l'unité de mesure de la durée"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -170,14 +145,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projet"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Erreur!"
@@ -188,44 +163,36 @@ msgid "Cancelled"
 msgstr "Annulé"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Date de fin"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planification"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Echéance"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Annuler"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Calculer la planification des phases"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Disponibilité"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -240,10 +207,15 @@ msgid "C_ompute"
 msgstr "Calculer"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
 msgstr ""
-"Calculer la plannification des phases pour tous les projets ou celui spécifié"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -251,49 +223,23 @@ msgid "Duration UoM"
 msgstr "UdM de durée"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Calculer l'ordonnancement des tâches"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Date de début au plus tard"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Allocation des ressources du projet"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Calculer l'ordonnancement des tâches"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Ressources"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Ordonnancer les phases d'un projet spécifié ou de tous les projets. ( "
-"Déclenche l'ouverture d'une vue de type Gantt ).\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Date de début"
 
@@ -304,16 +250,14 @@ msgstr "Tâches liées"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Dates"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"Disponibilité de cette ressource pour cette phase du projet, en pourcentage "
-"(=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -326,21 +270,6 @@ msgid "Project Tasks"
 msgstr "Tâches du projet"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Ressources du projet"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Ordonnancer et afficher les informations"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -362,78 +291,50 @@ msgstr ""
 "phase."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Un projet peut être divisé en différentes phases. Pour chaque phase, on peut "
-"allouer de ressources, décrire différentes tâches et chaîner la phase aux "
-"précédentes et suivantes, ajouter des contraintes de date pour "
-"l'ordonnancement automatique. Utiliser la planification à long terme pour "
-"planifier la disponibilité des ressources humaines, convertir les phases en "
-"une série de tâches quand on commence à travailler sur le projet."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Date de début"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Allocation des ressources"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "Forcer la phase à se terminer avant cette date"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "En attente"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "inconnue"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Détails de la tâche"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-"Emploi du temps des heures travaillées pour ajuster le rapport du diagramme "
-"de Gantt"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Calculer les tâches du projet"
@@ -481,21 +382,23 @@ msgid "Remaining Hours"
 msgstr "Heures restantes"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Responsable"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Erreur ! La date de fin de la tâche doit être postérieure à la date de "
+"démarrage"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Horaires de travail"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Actuel"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -503,29 +406,17 @@ msgid "Start Phase"
 msgstr "Démarrer la phase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Veuillez définir le projet à planifier"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Heures Totales"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "L'ordonnancement des tâches a été complété avec succès !"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Calculer l'ordonnancement des tâches pour un projet spécifié."
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Phase"
 
@@ -545,17 +436,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Date de fin"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Ressource"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nom"
@@ -566,40 +451,38 @@ msgid "Tasks Details"
 msgstr "Détails des tâches"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Période de travail"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Détail de la ressource"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Durée"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Ordonnancement"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Phase du projet"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Calculer les phases du projet"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Message"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Les boucles ne sont pas autorisées dans les phases"
@@ -610,19 +493,14 @@ msgid "Sequence"
 msgstr "Séquence"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Calculer tous les projets"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Congés de la ressource"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Planifier les tâches"
 
@@ -632,6 +510,133 @@ msgid "By default in days"
 msgstr "Par défaut en jour"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Durée"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Ordonnancement"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Allocation des ressources"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Calculer l'ordonnancement des phases"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Allocations des ressources"
+
+#~ msgid "Availability"
+#~ msgstr "Disponibilité"
+
+#~ msgid "Dates"
+#~ msgstr "Dates"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Calculer l'ordonnancement des tâches"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Calculer l'ordonnancement des tâches"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Allocation des ressources du projet"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "Disponibilité de cette ressource pour cette phase du projet, en pourcentage "
+#~ "(=50%)"
+
+#~ msgid "_Ok"
+#~ msgstr "_Ok"
+
+#~ msgid "Project Resources"
+#~ msgstr "Ressources du projet"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Allocation des ressources"
+
+#~ msgid "Task Detail"
+#~ msgstr "Détails de la tâche"
+
+#~ msgid "Current"
+#~ msgstr "Actuel"
+
+#~ msgid "Responsible"
+#~ msgstr "Responsable"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Calculer l'ordonnancement des tâches pour un projet spécifié."
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "L'ordonnancement des tâches a été complété avec succès !"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Détail de la ressource"
+
+#~ msgid "Message"
+#~ msgstr "Message"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Calculer tous les projets"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr ""
+#~ "Emploi du temps des heures travaillées pour ajuster le rapport du diagramme "
+#~ "de Gantt"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Gestion de projets à long terme"
+
+#~ msgid "Planning"
+#~ msgstr "Planification"
+
+#~ msgid "unknown"
+#~ msgstr "inconnue"
+
+#~ msgid "Resource"
+#~ msgstr "Ressource"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Ordonnancer les phases d'un projet spécifié ou de tous les projets. ( "
+#~ "Déclenche l'ouverture d'une vue de type Gantt ).\n"
+#~ "\t           "
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr ""
+#~ "Calculer la plannification des phases pour tous les projets ou celui spécifié"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Calculer la planification des phases"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Veuillez définir le projet à planifier"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Un projet peut être divisé en différentes phases. Pour chaque phase, on peut "
+#~ "allouer de ressources, décrire différentes tâches et chaîner la phase aux "
+#~ "précédentes et suivantes, ajouter des contraintes de date pour "
+#~ "l'ordonnancement automatique. Utiliser la planification à long terme pour "
+#~ "planifier la disponibilité des ressources humaines, convertir les phases en "
+#~ "une série de tâches quand on commence à travailler sur le projet."
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Ordonnancer et afficher les informations"
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index 434470646c2..a887b1a3ffd 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-12-12 09:44+0000\n"
 "Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
-"X-Generator: Launchpad (build 14458)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Upravljanje dugotrajnim projektima"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Izračunaj planiranje faza"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Faze"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,27 +34,31 @@ msgid "Project's Tasks"
 msgstr "Zadaci projekta"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Faze"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 "Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Alokacija resursa"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -72,72 +71,43 @@ msgid "Schedule"
 msgstr "Zakaži"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Modul upravljanja dugotrajnim projektima prati planiranje, "
-"zakazivanje i alokaciju resursa.\n"
-"        Uglavnom se koristi s Upravljanjem velikim projektima.\n"
-"            - Faze projekta će održavati voditelj projekta\n"
-"            - Izračunaj zakaizivanje faza: Uzračunaj početni datum i završni "
-"datum faza koje su u statusu nacrt,otvoreno i na čekanju za odabrani "
-"projekt.\n"
-"                                        Ako nijeda projekt nije odabran tada "
-"će se uzeti sve faze u statusu nacrt, otvoreno i na čekanju \n"
-"            - Izračunaj zakazivanje zadatka: RAdi na isti način kao i gumb "
-"za zakazivanje na fazama projekta. Uzima projekt kao argument i računa sve "
-"zadatke u statusu nacrt, otvoreno i na čekanju.\n"
-"            - Zakaži zadatke: Svi azdaci u statusu nacrt, otvoreno i na "
-"čekanju se zakazuju uzimajući početni datum faze.\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Alokacije resursa"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Dan"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Zadatak"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Izračunaj pojedinačni projekt"
@@ -154,6 +124,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "JM (Jedinica mjere) je mjerna jedinica za trajanje"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -165,14 +143,14 @@ msgstr " Planer računa prema datumu početka i trajanju."
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projekt"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Greška!"
@@ -183,44 +161,36 @@ msgid "Cancelled"
 msgstr "Poništeno"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Završni datum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planiranje"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Krajnji rok"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Otkaži"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Izračunaj zakazivanje faze"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Raspoloživost"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -235,9 +205,15 @@ msgid "C_ompute"
 msgstr "I_zračunaj"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Izračunaj zakazivanje faza za sve ili pojedini projekt"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -245,49 +221,23 @@ msgid "Duration UoM"
 msgstr "JM trajanja"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Izračunaj zakazivanje zadataka"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Minimalni početni datum"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Alokacija resursa projekta"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Izračunaj zakazivanje zadatka"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Resursi"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Za zakazivanje faza svih ili pojedinog projekta. Nakon toga otvara Gantt "
-"pogled.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Početni datum"
 
@@ -298,14 +248,14 @@ msgstr "Vezani zadaci"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Datumi"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
-msgstr "Raspoloživost tog resursa za tu fazu projekta u postotku (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -318,21 +268,6 @@ msgid "Project Tasks"
 msgstr "Zadaci projekta"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Resursi projekta"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_U redu"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Zakaži i prikaži info"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -351,76 +286,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "Početni datum faze mora biti manje od završnog datuma faze."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Projekt je moguće podjeliti u različite faze. Za svaku fazu, možete "
-"definriati alokaciju resursa, opisati različite zadatke i povezati vašu fazu "
-"sa prethodnom i sljedećom fazom, dodati datumska ograničenja za automatsko "
-"zakazivanje. Koristite dugotrajno planiranje za vaše raspoložive ljudske "
-"resurse, pretvorite vaš faze u seriju zadataka nakon početka rada na "
-"projektu."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Početni datum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Alokacija resursa"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "prisili završetak faze prije ovog datuma"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Nacrt"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Na čekanju"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "nepoznato"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Pojedinosti o zadataku"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Raspored radnih sati za prilagođavanje izvještaja Gantt dijagramom"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Izračun zadatka projekta"
@@ -468,21 +377,21 @@ msgid "Remaining Hours"
 msgstr "Preostali sati"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Odgovoran"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Radno vrijeme"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Trenutni"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -490,29 +399,17 @@ msgid "Start Phase"
 msgstr "Početna faza"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Molim navedite projekt za zakazivanje"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Ukupni sati"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Zakazivanje zdataka uspješno završeno"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Izračunaj zakazivanje zadataka za odabrani projekt"
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Faza"
 
@@ -533,17 +430,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Završni Datum"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Resurs"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Naziv"
@@ -554,40 +445,38 @@ msgid "Tasks Details"
 msgstr "Pojedinosti zadatka"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Razdoblje rada"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Pojedinosti resursa"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Trajanje"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Zakazivanje"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Faza projekta"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Izračun faza projekta"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Poruka"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Petlje u fazama nisu dozvoljene"
@@ -598,19 +487,14 @@ msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Izračunaj sve projekte"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Odsustva resursa"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Zakaži zadatke"
 
@@ -620,6 +504,128 @@ msgid "By default in days"
 msgstr "Predefinirano u danima"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Trajanje"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Zakazivanje"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Alokacija resursa"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Upravljanje dugotrajnim projektima"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Izračunaj planiranje faza"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Alokacije resursa"
+
+#~ msgid "Planning"
+#~ msgstr "Planiranje"
+
+#~ msgid "Availability"
+#~ msgstr "Raspoloživost"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Izračunaj zakazivanje faze"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Za zakazivanje faza svih ili pojedinog projekta. Nakon toga otvara Gantt "
+#~ "pogled.\n"
+#~ "\t           "
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Izračunaj zakazivanje faza za sve ili pojedini projekt"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Izračunaj zakazivanje zadatka"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Izračunaj zakazivanje zadataka"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Alokacija resursa projekta"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr "Raspoloživost tog resursa za tu fazu projekta u postotku (=50%)"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Zakaži i prikaži info"
+
+#~ msgid "Project Resources"
+#~ msgstr "Resursi projekta"
+
+#~ msgid "_Ok"
+#~ msgstr "_U redu"
+
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
+#~ msgid "unknown"
+#~ msgstr "nepoznato"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Alokacija resursa"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Projekt je moguće podjeliti u različite faze. Za svaku fazu, možete "
+#~ "definriati alokaciju resursa, opisati različite zadatke i povezati vašu fazu "
+#~ "sa prethodnom i sljedećom fazom, dodati datumska ograničenja za automatsko "
+#~ "zakazivanje. Koristite dugotrajno planiranje za vaše raspoložive ljudske "
+#~ "resurse, pretvorite vaš faze u seriju zadataka nakon početka rada na "
+#~ "projektu."
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "Raspored radnih sati za prilagođavanje izvještaja Gantt dijagramom"
+
+#~ msgid "Task Detail"
+#~ msgstr "Pojedinosti o zadataku"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Izračunaj zakazivanje zadataka za odabrani projekt"
+
+#~ msgid "Current"
+#~ msgstr "Trenutni"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Molim navedite projekt za zakazivanje"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Zakazivanje zdataka uspješno završeno"
+
+#~ msgid "Responsible"
+#~ msgstr "Odgovoran"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Pojedinosti resursa"
+
+#~ msgid "Resource"
+#~ msgstr "Resurs"
+
+#~ msgid "Message"
+#~ msgstr "Poruka"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Izračunaj sve projekte"
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index 14b95c1f8b3..25aa37edf84 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-02-08 16:34+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\n"
@@ -14,18 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Hosszútávú projektmenedzsment"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Fázisok ütemezésének számítása"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fázisok"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,17 +34,22 @@ msgid "Project's Tasks"
 msgstr "Projekt feladatok"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fázisok"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Csoportosítás..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
@@ -57,10 +57,9 @@ msgstr ""
 "befejező dátumának."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Erőforrás elosztás"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -73,72 +72,43 @@ msgid "Schedule"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Hosszú távú projektmenedzsment modul, amely nyomon követi a "
-"tervezést, az ütemezést és az erőforrás elosztást.\n"
-"        Főleg nagyprojektek kezelésére szolgál.\n"
-"            - A projektfázisokat a projektmenedzser tartja karban.\n"
-"            - Fázisok ütemezésének számítása: Az adott projekt tervezet, "
-"nyitott és függőben lévő állapotú fázisai kezdési és befejezési dátumának "
-"kiszámítása.\n"
-"                                        Ha nem adtak meg projektet, akkor az "
-"összes tervezet, nyitott és függőben lévő állapotú fázist veszi.\n"
-"            - Feladat ütemezésének számítása: Ugyanúgy működik, mint az "
-"ütemező gomb a projektfázisban. Veszi a projektet, mint paramétert, és "
-"minden tervezet, nyitott és függőben lévő feladatot kiszámít.\n"
-"            - Feladatok ütemezése: Minden tervezet, nyitott és függőben lévő "
-"állapotú feladatot ütemez a fázis kezdési dátumának figyelembe vételével.\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Erőforrás elosztások"
-
-#. 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:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Nap"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Feladat"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Egyetlen projekt ütemezésének számítása"
@@ -155,6 +125,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "Az időtartam mértékegysége (ME)"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -166,14 +144,14 @@ msgstr " A kezdési dátum és az időtartam alapján számítja az ütemező."
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projekt"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Hiba!"
@@ -184,44 +162,36 @@ msgid "Cancelled"
 msgstr "Törölt"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Befejezési dátum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Tervezés"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Határidő"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Fázis ütemezésének számítása"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (másolat)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Elérhetőség"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -236,9 +206,15 @@ msgid "C_ompute"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Az összes vagy a megadott projekt fázisai ütemezésének számítása"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -246,49 +222,23 @@ msgid "Duration UoM"
 msgstr "Időtartam ME"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Feladat ütemezésének számítása"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Legkorábbi kezdési dátum"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Projekt erőforrás elosztás"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Feladat ütemezésének számítása"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Erőforrások"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Minden projekt vagy az adott projekt fázisait ütemezi. Aztán megnyitja a "
-"Gantt-nézetet.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Kezdési dátum"
 
@@ -299,14 +249,14 @@ msgstr "Kapcsolódó feladatok"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Dátumok"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
-msgstr "Az erőforrás elérhetősége ebben a projektfázisban százalékban."
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -319,21 +269,6 @@ msgid "Project Tasks"
 msgstr "Projekt feladatok"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Projekt erőforrások"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Ütemezési és megjelenítési információ"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -355,76 +290,50 @@ msgstr ""
 "dátumának."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"A projekt különböző fázisokra osztható. Minden fázisra meghatározhatja az "
-"erőforrás elosztást, leírhatja a különböző feladatokat, összekötheti a "
-"fázist az előző és következő fázisokkal és adatkorlátozásokat adhat meg az "
-"automatizált ütemezéshez. Használja a hosszú távú tervezést a rendelkezésre "
-"álló emberi erőforrások tervezésére, a fázisoknak feladatok sorozataivá való "
-"átalakítására, amikor elkezd dolgozni a projekten."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Kezdési dátum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Erőforrás elosztás"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "A fázisnak ezelőtt az időpont előtt be kell fejeződnie."
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Tervezet"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Függőben lévő"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "ismeretlen"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Felhasználó"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Feladat részletei"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Projektfeladatok ütemezése"
@@ -472,21 +381,21 @@ msgid "Remaining Hours"
 msgstr "Hátralévő idő"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Felelős"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Munkaidő"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Jelenleg"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -494,29 +403,17 @@ msgid "Start Phase"
 msgstr "Kezdőfázis"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Kérem, adja meg az ütemezendő projektet."
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Összes óra"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "A feladat ütemezése sikeresen befejeződött."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Feladat ütemezésének számítása adott projektre."
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Szakasz"
 
@@ -537,17 +434,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Befejezési dátum"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Erőforrás"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Név"
@@ -558,40 +449,38 @@ msgid "Tasks Details"
 msgstr "Feladatok részletei"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Munkaidő"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Erőforrás részletei"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Időtartam"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Ütemezés"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Projektfázis"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Projektfázisok ütemezése"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Üzenet"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "A fázisban hurkok nem engedélyezettek."
@@ -602,19 +491,14 @@ msgid "Sequence"
 msgstr "Sorszám"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Minden projekt ütemezésének számítása"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Feladatok ütemezése"
 
@@ -624,6 +508,122 @@ msgid "By default in days"
 msgstr "Alapértelmezés szerint napokban megadva."
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Időtartam"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Ütemezés"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Hosszútávú projektmenedzsment"
+
+#~ msgid "Planning"
+#~ msgstr "Tervezés"
+
+#~ msgid "Availability"
+#~ msgstr "Elérhetőség"
+
+#~ msgid "unknown"
+#~ msgstr "ismeretlen"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Task Detail"
+#~ msgstr "Feladat részletei"
+
+#~ msgid "Current"
+#~ msgstr "Jelenleg"
+
+#~ msgid "Responsible"
+#~ msgstr "Felelős"
+
+#~ msgid "Message"
+#~ msgstr "Üzenet"
+
+#~ msgid "Project Resources"
+#~ msgstr "Projekt erőforrások"
+
+#~ msgid "Dates"
+#~ msgstr "Dátumok"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Erőforrás elosztás"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Kérem, adja meg az ütemezendő projektet."
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "A feladat ütemezése sikeresen befejeződött."
+
+#~ msgid "Resource Detail"
+#~ msgstr "Erőforrás részletei"
+
+#~ msgid "Resource"
+#~ msgstr "Erőforrás"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Erőforrás elosztások"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Erőforrás elosztás"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Projekt erőforrás elosztás"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Fázisok ütemezésének számítása"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Fázis ütemezésének számítása"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Az összes vagy a megadott projekt fázisai ütemezésének számítása"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Feladat ütemezésének számítása"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Feladat ütemezésének számítása"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr "Az erőforrás elérhetősége ebben a projektfázisban százalékban."
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Feladat ütemezésének számítása adott projektre."
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Minden projekt ütemezésének számítása"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Ütemezési és megjelenítési információ"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "A projekt különböző fázisokra osztható. Minden fázisra meghatározhatja az "
+#~ "erőforrás elosztást, leírhatja a különböző feladatokat, összekötheti a "
+#~ "fázist az előző és következő fázisokkal és adatkorlátozásokat adhat meg az "
+#~ "automatizált ütemezéshez. Használja a hosszú távú tervezést a rendelkezésre "
+#~ "álló emberi erőforrások tervezésére, a fázisoknak feladatok sorozataivá való "
+#~ "átalakítására, amikor elkezd dolgozni a projekten."
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Minden projekt vagy az adott projekt fázisait ütemezi. Aztán megnyitja a "
+#~ "Gantt-nézetet.\n"
+#~ "\t           "
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index c4a45177fb3..0c88ffda3a8 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-17 07:00+0000\n"
 "Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
@@ -15,18 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Gestione progetti a lungo termine"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Calcola la pianificazione delle fasi"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fasi"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -40,27 +35,31 @@ msgid "Project's Tasks"
 msgstr "Attività del progetto"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fasi"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 "Errore! La data inizio del progetto deve essere antecedente alla data fine."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Allocazione risorse"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -73,74 +72,43 @@ msgid "Schedule"
 msgstr "Pianificazione"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Modulo di gestione dei progetti a lungo termine che traccia la "
-"pianificazione, la programmazione e l'allocazione delle risorse.\n"
-"        Usato principalmente nella gestione di grossi progetti.\n"
-"            - Le fasi del progetto vengono gestite dal manager del progetto\n"
-"            - Calcola pianificazione fase: Calcola, per un dato progetto, le "
-"date iniziali e finali delle fasi che sono in stato di bozza, aperte o in "
-"sospeso.\n"
-"                                          Se non viene specificato il "
-"progetto, verranno prese tutte le fasi nello stato di bozza, aperte o in "
-"sospeso.\n"
-"             - Calcola pianificazione attività: Questo funziona allo stesso "
-"modo del bottone di pianificazione delle fasi. Prende un progetto come "
-"argomento e calcola tutte le attività aperte, bozze e in sospeso\n"
-"             - Pianifica attività: Tutte le attività nello stato di bozza, "
-"in sospeso o aperte vengono pianificate utilizzando la data di inizio della "
-"fase\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Errore ! Non è possibile creare attività ricorsive."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Allocazione risorse"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Errore! Non è possibile assegnare l'escalation allo stesso progetto!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Giorno"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Attività"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Calcola un singolo progetto"
@@ -157,6 +125,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "U.M. (unità di misura) è l'unità per la misurazione della durata"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -169,14 +145,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Progetto"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Errore!"
@@ -187,44 +163,36 @@ msgid "Cancelled"
 msgstr "Annullato"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Data fine"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Pianificazione"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Scadenza"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Annulla"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Calcola pianificazione fase"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Disponibilità"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -239,11 +207,15 @@ msgid "C_ompute"
 msgstr "C_alcola"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
 msgstr ""
-"Calcola la pianificazione delle fasi per tutti i progetti o quelli "
-"specificati"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -251,49 +223,23 @@ msgid "Duration UoM"
 msgstr "U.M. durata"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Calcola pianificazione attività"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Data inizio minima"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Allocazione risorse progetto"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Calcola pianificazione dell'attività"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Risorse"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Per pianificare le fasi di tutti i progetti o quelli specificati. Apre una "
-"visualizzazione Gantt.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Data di inizio"
 
@@ -304,16 +250,14 @@ msgstr "Attività collegate"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Date"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"Disponibilità di questa risorsa per questa fase di  progetto in percentuale "
-"(=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -326,21 +270,6 @@ msgid "Project Tasks"
 msgstr "Attività del Progetto"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Risorse progetto"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Informazioni di pianificazione e visualizzazione"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -361,77 +290,50 @@ msgstr ""
 "La data di inizio della fase deve essere precedente alla data di fine."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Un progetto può essere suddiviso nelle varie fasi. Per ogni fase, è "
-"possibile definire l'allocazione delle risorse, descrivere le varie attività "
-"e collegare la fase quelle precedenti o successive, aggiungere vincoli di "
-"data per la pianificazione automatica. Utilizzare la pianificazione a lungo "
-"termine al fine di pianificare le risorse umane disponibili, convertire le "
-"fasi in una serie di attività quando si inizia a lavorare su un progetto."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Data inizio"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Allocazione risorsa"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr "forza la fine della fase dopo questa data"
+msgstr "forza la fine della fase prima di questa data"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Bozza"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "In sospeso"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "sconosciuto"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Utente"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Dettaglio dell'attività"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-"Orario delle ore lavorative da adattare al report del diagramma di gantt"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Calcolo attività progetto"
@@ -479,21 +381,21 @@ msgid "Remaining Hours"
 msgstr "Ore Rimanenti"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Responsabile"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Tempo di lavoro"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Attuale"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -501,29 +403,17 @@ msgid "Start Phase"
 msgstr "Inizia fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Prego specificare il progetto da pianificare"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Ore Totali"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Attività pianificata completata con successo."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Calcola la pianificazione dell'attività per un progetto specificato."
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Fase"
 
@@ -544,17 +434,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Data fine"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Risorsa"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nome"
@@ -565,40 +449,38 @@ msgid "Tasks Details"
 msgstr "Dettagli Attività"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Periodo di lavoro"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Dettaglio risorsa"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Durata"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Pianificazione"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Fase progetto"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Calcolo fasi progetto"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Messaggio"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Le fasi circolari non sono permesse"
@@ -606,12 +488,7 @@ msgstr "Le fasi circolari non sono permesse"
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr "SequenzaC"
-
-#. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Calcola tutti i progetti"
+msgstr "Sequenza"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -619,9 +496,9 @@ msgid "Resource Leaves"
 msgstr "Permessi risorsa"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Pianifica attività"
 
@@ -631,6 +508,133 @@ msgid "By default in days"
 msgstr "Per default in giorni"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Durata"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Pianificazione"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Gestione progetti a lungo termine"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Allocazione risorse"
+
+#~ msgid "Planning"
+#~ msgstr "Pianificazione"
+
+#~ msgid "Availability"
+#~ msgstr "Disponibilità"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Allocazione risorse progetto"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "Disponibilità di questa risorsa per questa fase di  progetto in percentuale "
+#~ "(=50%)"
+
+#~ msgid "Project Resources"
+#~ msgstr "Risorse progetto"
+
+#~ msgid "_Ok"
+#~ msgstr "_Ok"
+
+#~ msgid "Dates"
+#~ msgstr "Date"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Allocazione risorsa"
+
+#~ msgid "unknown"
+#~ msgstr "sconosciuto"
+
+#~ msgid "Task Detail"
+#~ msgstr "Dettaglio dell'attività"
+
+#~ msgid "Current"
+#~ msgstr "Attuale"
+
+#~ msgid "Responsible"
+#~ msgstr "Responsabile"
+
+#~ msgid "Resource"
+#~ msgstr "Risorsa"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Prego specificare il progetto da pianificare"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Attività pianificata completata con successo."
+
+#~ msgid "Resource Detail"
+#~ msgstr "Dettaglio risorsa"
+
+#~ msgid "Message"
+#~ msgstr "Messaggio"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Calcola tutti i progetti"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Calcola pianificazione dell'attività"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Allocazione risorse"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Calcola la pianificazione delle fasi"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Calcola pianificazione fase"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr ""
+#~ "Calcola la pianificazione delle fasi per tutti i progetti o quelli "
+#~ "specificati"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Calcola pianificazione attività"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Per pianificare le fasi di tutti i progetti o quelli specificati. Apre una "
+#~ "visualizzazione Gantt.\n"
+#~ "\t           "
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Informazioni di pianificazione e visualizzazione"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Un progetto può essere suddiviso nelle varie fasi. Per ogni fase, è "
+#~ "possibile definire l'allocazione delle risorse, descrivere le varie attività "
+#~ "e collegare la fase quelle precedenti o successive, aggiungere vincoli di "
+#~ "data per la pianificazione automatica. Utilizzare la pianificazione a lungo "
+#~ "termine al fine di pianificare le risorse umane disponibili, convertire le "
+#~ "fasi in una serie di attività quando si inizia a lavorare su un progetto."
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr ""
+#~ "Orario delle ore lavorative da adattare al report del diagramma di gantt"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Calcola la pianificazione dell'attività per un progetto specificato."
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index fe2259f2a89..bd77e8c1b68 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2010-12-31 10:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Ilgtermiņa projektu vadība"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Aprēķināt fāžu grafiku"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fāzes"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,26 +34,30 @@ msgid "Project's Tasks"
 msgstr "Projekta uzdevumi"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fāzes"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Grupēt pēc..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Resursu iedalīšana"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -71,54 +70,43 @@ msgid "Schedule"
 msgstr "Grafiks"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Resursu iedalīšanas"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Diena"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Uzdevums"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Aprēķināt vienu projektu"
@@ -135,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "Mērv. (mērvienība) ir ilguma mērvienība"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -146,14 +142,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projekts"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Kļūda!"
@@ -164,44 +160,36 @@ msgid "Cancelled"
 msgstr "Atcelts"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Beigu Datums"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Plānošana"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Termiņš"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Atcelt"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Aprēķināt fāzes grafiku"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Pieejamība"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -216,9 +204,15 @@ msgid "C_ompute"
 msgstr "A_prēķināt"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Aprēķināt fāžu grafiku visiem vai norādītajam projektam"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -226,46 +220,23 @@ msgid "Duration UoM"
 msgstr "Ilguma mērv."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Aprēķināt uzdevumu grafiku"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Minimālais sākuma datums"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Projekta resursu iedalīšana"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Aprēķināt uzdevumu grafiku"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Resursi"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Sākuma Datums"
 
@@ -276,14 +247,14 @@ msgstr "Saistītie uzdevumi"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Datumi"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
-msgstr "Šī resursa pieejamība šai projekta fāzei procentos (piem., 50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -296,21 +267,6 @@ msgid "Project Tasks"
 msgstr "Projekta uzdevumi"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Projekta resursi"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_Labi"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr ""
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -328,70 +284,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "Fāzes sākuma datumam jābūt mazākam par fāzes beigu datumu."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Sākuma datums"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Resursu iedalīšana"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "uzspiest fāzei beigties pirms šī datuma"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Melnraksts"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Neizlemts"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "nezināms"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Lietotājs"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Uzdevuma informācija"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Darba laika saraksts, ar ko pielāgot Ganta diagrammas atskaiti"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Projekts - aprēķināt uzdevumus"
@@ -439,21 +375,21 @@ msgid "Remaining Hours"
 msgstr "Atlikušās Stundas"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Atbildīgais"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Darba Laiks"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Pašreizējā"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -461,29 +397,17 @@ msgid "Start Phase"
 msgstr "Sākt fāzi"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Lūdzu, norādiet plānojamo projektu"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Stundas Kopā"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Uzdevumu grafika veidošana bija veiksmīga"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Aprēķināt uzdevumu grafiku norādītajām projektam."
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Fāze"
 
@@ -499,17 +423,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Beigu datums"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Resurss"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nosaukums"
@@ -520,40 +438,38 @@ msgid "Tasks Details"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Darba laiks"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Resursa informācija"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Ilgums"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Plānošana"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Projekta fāze"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Projekts: aprēķināt fāzes"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Ziņa"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Cilpas fāzēs nav atļautas"
@@ -564,19 +480,14 @@ msgid "Sequence"
 msgstr "Secība"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Aprēķināt visus projektus"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Resursu lapas"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Ieplānot uzdevumus"
 
@@ -586,6 +497,101 @@ msgid "By default in days"
 msgstr "Pēc noklusējuma dienās"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Ilgums"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Plānošana"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Resursu iedalīšana"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Ilgtermiņa projektu vadība"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Aprēķināt fāžu grafiku"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Resursu iedalīšanas"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Aprēķināt fāzes grafiku"
+
+#~ msgid "Availability"
+#~ msgstr "Pieejamība"
+
+#~ msgid "Planning"
+#~ msgstr "Plānošana"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Projekta resursu iedalīšana"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Aprēķināt fāžu grafiku visiem vai norādītajam projektam"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Aprēķināt uzdevumu grafiku"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Aprēķināt uzdevumu grafiku"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr "Šī resursa pieejamība šai projekta fāzei procentos (piem., 50%)"
+
+#~ msgid "Project Resources"
+#~ msgstr "Projekta resursi"
+
+#~ msgid "_Ok"
+#~ msgstr "_Labi"
+
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
+#~ msgid "unknown"
+#~ msgstr "nezināms"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Resursu iedalīšana"
+
+#~ msgid "Task Detail"
+#~ msgstr "Uzdevuma informācija"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "Darba laika saraksts, ar ko pielāgot Ganta diagrammas atskaiti"
+
+#~ msgid "Current"
+#~ msgstr "Pašreizējā"
+
+#~ msgid "Responsible"
+#~ msgstr "Atbildīgais"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Resursa informācija"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Aprēķināt uzdevumu grafiku norādītajām projektam."
+
+#~ msgid "Resource"
+#~ msgstr "Resurss"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Uzdevumu grafika veidošana bija veiksmīga"
+
+#~ msgid "Message"
+#~ msgstr "Ziņa"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Aprēķināt visus projektus"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Lūdzu, norādiet plānojamo projektu"
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 31fda45e39b..ae39a144695 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-24 13:45+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Langdurige projecten beheer"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Planning van fases berekenen"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,26 +34,30 @@ msgid "Project's Tasks"
 msgstr "Taken van het project"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fases"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Groepeer op..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr "Fout! Project startdatum moet liggen voor project einddatum."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Resource toewijzing"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -71,71 +70,43 @@ msgid "Schedule"
 msgstr "Planning"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"        Langdurige projecten beheer module die indeling, planning en "
-"resource toewijzing bijhoudt.\n"
-"        Hoofdzakelijk gebruikt bij beheer van grote projecten.\n"
-"            - Project fases worden onderhouden door manager van het project\n"
-"            - Fase planning berekenen: Bereken begidatum en einddatum van de "
-"fases die in concept, open of wachtend status zijn.\n"
-"                                        Als geen project is aangegeven, dan "
-"worden alle projecten berekend\n"
-"            - Taak planning berekenen: werkt hetzelfde als planning knop bij "
-"projectfase. Het berekent de planning van alle concept, open en wachtende "
-"taken\n"
-"            - Taken plannen: Alle taken in concept, open en wachtend status "
-"worden gepland vanaf de begindatum van de fase\n"
-"\n"
-"    "
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Fout! U kunt geen recursieve taken aanmaken."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Resource toewijzingen"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Fout! U kunt geen escalatie toewijzen aan hetzelfde project!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Dag"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Taak"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Een enkel project berekenen"
@@ -152,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "ME (Meeteenheid) is de eenheid voor de doorlooptijd"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -164,14 +143,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Project"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -182,44 +161,36 @@ msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Einddatum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planning"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Uiterste datum"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Annuleren"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Fase planning berekenen"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (kopie)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Beschikbaarheid"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -234,9 +205,15 @@ msgid "C_ompute"
 msgstr "_Berekenen"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Fase planning van alle of gespecificeerde projecten berekenen"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -244,49 +221,23 @@ msgid "Duration UoM"
 msgstr "Doorlooptijd eenheid"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Taak planning berekenen"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Minimum startdatum"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Project resource toewijzing"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Taak planning berekenen"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Resources"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"De fases van alle of gespecificeerde projecten plannen. Daarna een gantt "
-"weergave openen.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Begindatum"
 
@@ -297,15 +248,14 @@ msgstr "Verbonden taken"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Data"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"Beschikbaarheid van de resource voor deze projectfase in percentage (=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -318,21 +268,6 @@ msgid "Project Tasks"
 msgstr "Project taken"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Project resources"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Plannen en info afbeelden"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -352,76 +287,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "Fase begindatum moet voor fase einddatum liggen."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Een project kan worden gesplitst in verschillende fases. Voor elke fase kunt "
-"u de resource toewijzing definiëren, verschillende taken beschrijven, fases "
-"met vorige en volgende fases koppelen en datum beperkingen toevoegen voor de "
-"automatische planning. Gebruik de langdurige planning om de beschikbare "
-"resources te plannen en converteer uw fases in een serie taken zodra u "
-"begint te werken aan het project."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Begindatum"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Resource toewijzing"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "de fase forceren te eindigen vóór deze datum"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Concept"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Wachtend"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "onbekend"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Taakdetail"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "Rooster met werktijden ter correctie van de GANTT-diagrammen."
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Project taken berekenen"
@@ -469,21 +378,21 @@ msgid "Remaining Hours"
 msgstr "Resterende uren"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Verantwoordelijke"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fout! Einddatum taak moet groter zijn dat begindatum taak"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Werktijd"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Actueel"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -491,29 +400,17 @@ msgid "Start Phase"
 msgstr "Begin fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Geef aub het te plannen project op"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Totale uren"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Taak planning met succes voltooid."
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Taak planning berekenen voor opgegeven project."
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Fase"
 
@@ -534,17 +431,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Einddatum"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Resource"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Naam"
@@ -555,40 +446,38 @@ msgid "Tasks Details"
 msgstr "Taakdetails"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Werkperiode"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Resource detail"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Tijdsduur"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Planning"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Project fase"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Project fase berekenen"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Bericht"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Lussen in fases niet toegestaan"
@@ -599,19 +488,14 @@ msgid "Sequence"
 msgstr "Volgnummer"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Alle projecten berekenen"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Afwezigheid resource"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Taken plannen"
 
@@ -621,6 +505,129 @@ msgid "By default in days"
 msgstr "Standaard in dagen"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Tijdsduur"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Planning"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Resource toewijzing"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Langdurige projecten beheer"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Planning van fases berekenen"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Resource toewijzingen"
+
+#~ msgid "Availability"
+#~ msgstr "Beschikbaarheid"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Fase planning berekenen"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "De fases van alle of gespecificeerde projecten plannen. Daarna een gantt "
+#~ "weergave openen.\n"
+#~ "\t           "
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Project resource toewijzing"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Fase planning van alle of gespecificeerde projecten berekenen"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Taak planning berekenen"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Taak planning berekenen"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "Beschikbaarheid van de resource voor deze projectfase in percentage (=50%)"
+
+#~ msgid "Project Resources"
+#~ msgstr "Project resources"
+
+#~ msgid "_Ok"
+#~ msgstr "_Ok"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Plannen en info afbeelden"
+
+#~ msgid "Dates"
+#~ msgstr "Data"
+
+#~ msgid "unknown"
+#~ msgstr "onbekend"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Resource toewijzing"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Een project kan worden gesplitst in verschillende fases. Voor elke fase kunt "
+#~ "u de resource toewijzing definiëren, verschillende taken beschrijven, fases "
+#~ "met vorige en volgende fases koppelen en datum beperkingen toevoegen voor de "
+#~ "automatische planning. Gebruik de langdurige planning om de beschikbare "
+#~ "resources te plannen en converteer uw fases in een serie taken zodra u "
+#~ "begint te werken aan het project."
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "Rooster met werktijden ter correctie van de GANTT-diagrammen."
+
+#~ msgid "Task Detail"
+#~ msgstr "Taakdetail"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Taak planning berekenen voor opgegeven project."
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Geef aub het te plannen project op"
+
+#~ msgid "Current"
+#~ msgstr "Actueel"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Taak planning met succes voltooid."
+
+#~ msgid "Responsible"
+#~ msgstr "Verantwoordelijke"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Resource detail"
+
+#~ msgid "Resource"
+#~ msgstr "Resource"
+
+#~ msgid "Message"
+#~ msgstr "Bericht"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Alle projecten berekenen"
+
+#~ msgid "Planning"
+#~ msgstr "Planning"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index 79eb160c3c4..4e1f8f90828 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2010-12-31 11:08+0000\n"
 "Last-Translator: Bhumika (OpenERP) <sbh@tinyerp.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Zarządzanie projektami długoterminowymi"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Oblicz planowanie faz"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fazy"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,26 +34,30 @@ msgid "Project's Tasks"
 msgstr "Zadania projektu"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fazy"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Alokacja zasobów"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -71,54 +70,43 @@ msgid "Schedule"
 msgstr "Harmonogram"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-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 "Alokacje zasobów"
-
-#. 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:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Dzień"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Zadanie"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Oblicz pojedyńczy projekt"
@@ -135,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "JM (Jednostka Miary) jest jednostką miary dla czasu trwania"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -146,14 +142,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projekt"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Błąd!"
@@ -164,44 +160,36 @@ msgid "Cancelled"
 msgstr "Anulowano"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Data końcowa"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planowanie"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Termin"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Anuluj"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Oblicz planowanie fazy"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Dostępność"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -216,9 +204,15 @@ msgid "C_ompute"
 msgstr "_Oblicz"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Oblicz planowanie faz dla wszystkich lub wybranych projektów"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -226,46 +220,23 @@ msgid "Duration UoM"
 msgstr "JM czasu trwania"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Oblicz planowanie zadań"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Minimalna data początkowa"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "Alokacja zasobów projektu"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Oblicz planowanie zadania"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Zasoby"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Data początkowa"
 
@@ -276,14 +247,14 @@ msgstr "Zadania powiązane"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Daty"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
-msgstr "Dostępność tego zasobu dla tej fazy projektu w procentach (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -296,21 +267,6 @@ msgid "Project Tasks"
 msgstr "Zadania projektu"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Zasoby projektu"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr ""
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -328,71 +284,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "Data początkowa projektu musi być mniejsza od daty końcowej."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Data Początkowa"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Alokacja zasobów"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr ""
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Projekt"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Oczekujące"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Szczegóły zadania"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-"Rozkład godzin roboczych do uwzględnienia w raporcie z wykresem Gantta"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "Obliczanie zadań projektu"
@@ -440,20 +375,20 @@ msgid "Remaining Hours"
 msgstr "Pozostałe godziny"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Odpowiedzialny"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Czas pracy"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
 msgstr ""
 
 #. module: project_long_term
@@ -462,29 +397,17 @@ msgid "Start Phase"
 msgstr "Rozpocznij fazę"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "Wybierz projekt do zaplanowania"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Suma godzin"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "Planowanie zadań zakończono pomyślnie"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "Oblicz planowanie zadań dla projektu"
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Faza"
 
@@ -505,17 +428,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Data końcowa"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Zasób"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nazwa"
@@ -526,40 +443,38 @@ msgid "Tasks Details"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr "Godziny pracy"
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "Szczegóły zasobu"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Czas trwania"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Harmonogram"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Faza projektu"
 
 #. 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "Obliczenie faz projektu"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Wiadomość"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "Zapętlenia w fazach są niedozwolone"
@@ -570,19 +485,14 @@ msgid "Sequence"
 msgstr "Numeracja"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "Oblicz wszystkie projekty"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "Niebecności zasobu"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Planuj zadania"
 
@@ -592,6 +502,90 @@ msgid "By default in days"
 msgstr "Domyślnie w dniach"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Czas trwania"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Harmonogram"
+
+#~ msgid "Planning"
+#~ msgstr "Planowanie"
+
+#~ msgid "Dates"
+#~ msgstr "Daty"
+
+#~ msgid "Resource"
+#~ msgstr "Zasób"
+
+#~ msgid "Responsible"
+#~ msgstr "Odpowiedzialny"
+
+#~ msgid "Message"
+#~ msgstr "Wiadomość"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Alokacja zasobów"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Zarządzanie projektami długoterminowymi"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Oblicz planowanie faz"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Alokacje zasobów"
+
+#~ msgid "Availability"
+#~ msgstr "Dostępność"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Oblicz planowanie fazy"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Oblicz planowanie faz dla wszystkich lub wybranych projektów"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Oblicz planowanie zadania"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Oblicz planowanie zadań"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "Alokacja zasobów projektu"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr "Dostępność tego zasobu dla tej fazy projektu w procentach (=50%)"
+
+#~ msgid "Project Resources"
+#~ msgstr "Zasoby projektu"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Alokacja zasobów"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr ""
+#~ "Rozkład godzin roboczych do uwzględnienia w raporcie z wykresem Gantta"
+
+#~ msgid "Task Detail"
+#~ msgstr "Szczegóły zadania"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "Oblicz planowanie zadań dla projektu"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "Wybierz projekt do zaplanowania"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "Planowanie zadań zakończono pomyślnie"
+
+#~ msgid "Resource Detail"
+#~ msgstr "Szczegóły zasobu"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "Oblicz wszystkie projekty"
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index b12d7d22926..6d313f84717 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-13 23:26+0000\n"
 "Last-Translator: Bhumika (OpenERP) <sbh@tinyerp.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "Gestão de projeto a longo prazo"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr ""
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,25 +34,29 @@ msgid "Project's Tasks"
 msgstr "Tarefas do projeto"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fases"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr "Erro! A data de início do projeto deve ser anterior à do seu fim"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
+#: view:project.phase:0
+msgid "In Progress Phases"
 msgstr ""
 
 #. module: project_long_term
@@ -71,54 +70,43 @@ msgid "Schedule"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Erro! Não se pode criar tarefas recursivamente"
 
 #. 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:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Dia"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Tarefa"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr ""
@@ -135,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr ""
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -146,14 +142,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projeto"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -164,44 +160,36 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Data de fim"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planeamento"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Prazo limite"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "_Cancel"
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Disponibilidade"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -216,19 +204,19 @@ msgid "C_ompute"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
 msgstr ""
 
 #. module: project_long_term
-#: field:project.phase,product_uom:0
-msgid "Duration UoM"
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
 msgstr ""
 
 #. module: project_long_term
@@ -237,35 +225,18 @@ msgid "Minimum Start Date"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Recursos"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Data de início"
 
@@ -276,13 +247,13 @@ msgstr "Tarefas relacionadas"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Datas"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
 
 #. module: project_long_term
@@ -296,21 +267,6 @@ msgid "Project Tasks"
 msgstr "Tarefas do projeto"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Recursos do projeto"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr ""
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -328,70 +284,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "A data de início da fase tem de ser anterior à do seu fim."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Data de início"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr ""
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "forçar o fim da fase para antes desta data"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
 #. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "Pending"
+msgid "Pending Phases"
 msgstr ""
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "desconhecido"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr ""
 
 #. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Utilizador"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Detalhe da tarefa"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr ""
@@ -439,21 +375,21 @@ msgid "Remaining Hours"
 msgstr "Horas restantes"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Responsável"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Atual"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -461,29 +397,17 @@ msgid "Start Phase"
 msgstr "Iniciar fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Total de horas"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr ""
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
+#: view:project.user.allocation:0
+msgid "Users"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Fase"
 
@@ -499,17 +423,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Data de fim"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Recurso"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nome"
@@ -520,38 +438,36 @@ msgid "Tasks Details"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr ""
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duração"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
+#: view:project.phase:0
+msgid "Project Users"
 msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Fase de projeto"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_compute_phases
-msgid "Project Compute Phases"
+#: 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"
+"               "
 msgstr ""
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Mensagem"
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr ""
 
 #. module: project_long_term
 #: constraint:project.phase:0
@@ -564,19 +480,14 @@ msgid "Sequence"
 msgstr "Sequência"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr ""
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Indisponibilidade do recurso"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "Agendar tarefas"
 
@@ -586,6 +497,48 @@ msgid "By default in days"
 msgstr ""
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Duração"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr ""
+
+#~ msgid "Planning"
+#~ msgstr "Planeamento"
+
+#~ msgid "Availability"
+#~ msgstr "Disponibilidade"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Dates"
+#~ msgstr "Datas"
+
+#~ msgid "unknown"
+#~ msgstr "desconhecido"
+
+#~ msgid "Task Detail"
+#~ msgstr "Detalhe da tarefa"
+
+#~ msgid "Current"
+#~ msgstr "Atual"
+
+#~ msgid "Responsible"
+#~ msgstr "Responsável"
+
+#~ msgid "Resource"
+#~ msgstr "Recurso"
+
+#~ msgid "Message"
+#~ msgstr "Mensagem"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "Gestão de projeto a longo prazo"
+
+#~ msgid "Project Resources"
+#~ msgstr "Recursos do projeto"
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index e34a8fef0a8..f4fd8bd051e 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-01-25 02:13+0000\n"
 "Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "Calcular Agendamento de Fases"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,26 +34,30 @@ msgid "Project's Tasks"
 msgstr "Tarefas do Projeto"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "Fases"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "Alocação de Recursos"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -71,54 +70,43 @@ msgid "Schedule"
 msgstr "Agendar"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Erro! Você não pode criar tarefas recursivas."
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
-msgid "Resource Allocations"
-msgstr "Alocação de Recursos"
-
-#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr "Erro! Você não pode atribuir escalas para o mesmo projeto!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "Dia"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 msgstr "Tarefa"
 
 #. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "Calcular um Projeto Único"
@@ -135,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "UdM (Unidade de Medida) é a unidade de medida para Duração"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -147,14 +143,14 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "Projeto"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "Erro!"
@@ -165,44 +161,36 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "Data Final"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "Planejamento"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "Prazo Final"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "Calcular Agendamento da Fase"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "Disponibilidade"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -217,9 +205,15 @@ msgid "C_ompute"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "Calcule Agendamento de fases para todos ou um projeto específico"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -227,49 +221,23 @@ msgid "Duration UoM"
 msgstr "UdM Duração"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "Calcule Agendamento de Tarefas"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "Data Inicial Mínima"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "Calcule Agendamento de Tarefas"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
 msgid "Resources"
 msgstr "Recursos"
 
 #. 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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"Para agendar as fases de todos ou um projeto específico. Em seguida, abra "
-"uma vista de Gantt.\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Data Inicial"
 
@@ -280,16 +248,14 @@ msgstr "Tarefas Relacionadas"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Datas"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
 msgstr ""
-"Disponibilidade deste recurso para esta fase do projeto em porcentagem (= "
-"50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -302,21 +268,6 @@ msgid "Project Tasks"
 msgstr "Tarefas do Projeto"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "Recursos do Projeto"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "Info de Programação e Exibição"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -336,76 +287,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "Data de Início da Fase deve ser inferior a data final de fase."
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"Um projeto pode ser dividido em diferentes fases. Para cada fase, você pode "
-"definir sua alocação de recursos, descrever as diferentes tarefas e links "
-"para as fases anteriores e seguintes, adicionar restrições de data para o "
-"agendamento automatizado. Use o planejamento de longo prazo, a fim de "
-"planificar sua disponibilidade de recursos humanos, converter suas fases em "
-"uma série de tarefas quando você começar a trabalhar no do projeto."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "Data inicial"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "Alocação de Recursos"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "forçar a fase para terminar antes dessa data"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "Provisório"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "Pendente"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "desconhecido"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "Usuário"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "Detalhes da Tarefa"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr ""
@@ -453,21 +378,21 @@ msgid "Remaining Hours"
 msgstr "Horas Restantes"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "Responsável"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "Tempo Trabalhado"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "Atual"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -475,29 +400,17 @@ msgid "Start Phase"
 msgstr "Fase Inicial"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "Horas Totais"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
+#: view:project.user.allocation:0
+msgid "Users"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr ""
-
-#. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "Fase"
 
@@ -513,17 +426,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "Data Final"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "Recurso"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "Nome"
@@ -534,38 +441,36 @@ msgid "Tasks Details"
 msgstr "Detalhes das Tarefas"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr ""
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duração"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
+#: view:project.phase:0
+msgid "Project Users"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "Agendamento"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 msgstr "Fase de Projeto"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_compute_phases
-msgid "Project Compute Phases"
+#: 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"
+"               "
 msgstr ""
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "Mensagem"
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr ""
 
 #. module: project_long_term
 #: constraint:project.phase:0
@@ -578,19 +483,14 @@ msgid "Sequence"
 msgstr "Sequência"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr ""
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr ""
 
@@ -600,6 +500,102 @@ msgid "By default in days"
 msgstr ""
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "Duração"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Agendamento"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "Alocação de Recursos"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "Calcular Agendamento de Fases"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "Alocação de Recursos"
+
+#~ msgid "Availability"
+#~ msgstr "Disponibilidade"
+
+#~ msgid "Planning"
+#~ msgstr "Planejamento"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "Calcular Agendamento da Fase"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "Para agendar as fases de todos ou um projeto específico. Em seguida, abra "
+#~ "uma vista de Gantt.\n"
+#~ "\t           "
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "Calcule Agendamento de fases para todos ou um projeto específico"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "Calcule Agendamento de Tarefas"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "Calcule Agendamento de Tarefas"
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr ""
+#~ "Disponibilidade deste recurso para esta fase do projeto em porcentagem (= "
+#~ "50%)"
+
+#~ msgid "Project Resources"
+#~ msgstr "Recursos do Projeto"
+
+#~ msgid "_Ok"
+#~ msgstr "_Ok"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "Info de Programação e Exibição"
+
+#~ msgid "Dates"
+#~ msgstr "Datas"
+
+#~ msgid "unknown"
+#~ msgstr "desconhecido"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "Alocação de Recursos"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "Um projeto pode ser dividido em diferentes fases. Para cada fase, você pode "
+#~ "definir sua alocação de recursos, descrever as diferentes tarefas e links "
+#~ "para as fases anteriores e seguintes, adicionar restrições de data para o "
+#~ "agendamento automatizado. Use o planejamento de longo prazo, a fim de "
+#~ "planificar sua disponibilidade de recursos humanos, converter suas fases em "
+#~ "uma série de tarefas quando você começar a trabalhar no do projeto."
+
+#~ msgid "Task Detail"
+#~ msgstr "Detalhes da Tarefa"
+
+#~ msgid "Current"
+#~ msgstr "Atual"
+
+#~ msgid "Responsible"
+#~ msgstr "Responsável"
+
+#~ msgid "Resource"
+#~ msgstr "Recurso"
+
+#~ msgid "Message"
+#~ msgstr "Mensagem"
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 225907d2f5b..fad4a90114f 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -7,25 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:46+0000\n"
 "PO-Revision-Date: 2011-06-30 06:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:24+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: project_long_term
-#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
-msgid "Long Term Project Management"
-msgstr "长期项目管理"
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of Phases"
-msgstr "项目周期计算"
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "阶段"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -39,26 +34,30 @@ msgid "Project's Tasks"
 msgstr "项目任务"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phases
-msgid "Phases"
-msgstr "阶段"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Group By..."
 msgstr "分组..."
 
 #. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr "错误！项目的开始日期必须小于项目的结束日期"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: view:project.resource.allocation:0
-msgid "Resources Allocation"
-msgstr "资源分配"
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -71,54 +70,43 @@ msgid "Schedule"
 msgstr "日程"
 
 #. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid ""
-"\n"
-"\n"
-"        Long Term Project management module that tracks planning, "
-"scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of "
-"the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the "
-"draft,open and pending state phases will be taken\n"
-"            - Compute Task Scheduling: This works same as the scheduler "
-"button on project.phase. It takes the project as argument and computes all "
-"the open,draft and pending tasks\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and "
-"open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
-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:128
+#: code:addons/project_long_term/project_long_term.py:126
 #, python-format
 msgid "Day"
 msgstr "天"
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+
+#. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
 msgstr "计算单个项目"
@@ -135,6 +123,14 @@ msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr "某个周期的计量单位"
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
@@ -146,14 +142,14 @@ msgstr " 这个日期是由开始日期和计划日数根据日历计算出来�
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,project_id:0
 #: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
 msgid "Project"
 msgstr "项目"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -164,44 +160,36 @@ msgid "Cancelled"
 msgstr "已取消"
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_end:0
+#: help:project.user.allocation,date_end:0
 msgid "Ending Date"
 msgstr "结束日期"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
-msgstr "计划"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
 msgstr "截止日期"
 
 #. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-msgid "Compute Phase Scheduling"
-msgstr "计算阶段日程"
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:190
+#: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid " (copy)"
 msgstr " (copy)"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,useability:0
-msgid "Availability"
-msgstr "可用"
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -216,9 +204,15 @@ msgid "C_ompute"
 msgstr "计算（_O）"
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "Compute Scheduling of phases for all or specified project"
-msgstr "针对所有或特定的一个项目计算阶段周期"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -226,48 +220,23 @@ msgid "Duration UoM"
 msgstr "时间段计量单位"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
-#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
-msgid "Compute Task Scheduling"
-msgstr "计算项目日程"
-
-#. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
 msgstr "最早开始时间"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_resource_allocation
-#: view:project.phase:0
-#: view:project.resource.allocation:0
-msgid "Project Resource Allocation"
-msgstr "项目资源分配"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task"
-msgstr "计算任务日程"
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_resource
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_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"
-"\t           "
+#: view:project.phase:0
+msgid "My Projects"
 msgstr ""
-"某个或所有项目的阶段日程。会显示一个甘特图。\n"
-"\t           "
 
 #. module: project_long_term
-#: help:project.resource.allocation,date_start:0
+#: help:project.user.allocation,date_start:0
 msgid "Starting Date"
 msgstr "开始日期"
 
@@ -278,14 +247,14 @@ msgstr "相关任务"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "日期"
+msgid "New Phases"
+msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid ""
-"Availability of this resource for this project phase in percentage (=50%)"
-msgstr "这个资源在此项目阶段的可用性，用百分数表示"
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -298,21 +267,6 @@ msgid "Project Tasks"
 msgstr "项目任务列表"
 
 #. module: project_long_term
-#: field:project.phase,resource_ids:0
-msgid "Project Resources"
-msgstr "项目资源"
-
-#. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "_Ok"
-msgstr "确定(_O)"
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Schedule and Display info"
-msgstr "日程和显示信息"
-
-#. module: project_long_term
 #: help:project.phase,date_start:0
 msgid ""
 "It's computed by the scheduler according the project date or the end date of "
@@ -330,72 +284,50 @@ msgid "Phase start-date must be lower than phase end-date."
 msgstr "阶段的开始日期必须早于项目的结束日期"
 
 #. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_schedule_tasks
-msgid "project.schedule.tasks"
-msgstr "project.schedule.tasks"
-
-#. 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 phases, 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 the project."
+#: view:project.phase:0
+msgid "Start Month"
 msgstr ""
-"项目能分成不同的阶段。可以为每个阶段分配资源，定义不同的任务并可以把各个阶段连起来，按日历自动计算计划日期。使用长期计划可以在项目的开始阶段管理人员可用性"
-"、划分每阶段的任务。"
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
-#: field:project.resource.allocation,date_start:0
+#: field:project.user.allocation,date_start:0
 msgid "Start Date"
 msgstr "开始日期"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Resource Allocation"
-msgstr "资源分配"
-
-#. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
 msgstr "强制该阶段在此日期前完成"
 
 #. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
-#: selection:project.phase,state:0
 msgid "Draft"
 msgstr "草稿"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Pending Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
 msgstr "等待中"
 
 #. module: project_long_term
-#: field:project.resource.allocation,name:0
-msgid "unknown"
-msgstr "未知的"
-
-#. module: project_long_term
-#: field:project.resource.allocation,user_id:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
 msgid "User"
 msgstr "用户"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Task Detail"
-msgstr "任务细节"
-
-#. module: project_long_term
-#: help:project.project,resource_calendar_id:0
-msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "从时间表的工作时间来调整甘特图报表"
-
-#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
 msgstr "计算任务计划"
@@ -443,21 +375,21 @@ msgid "Remaining Hours"
 msgstr "剩余小时数"
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,responsible_id:0
-msgid "Responsible"
-msgstr "负责人"
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "错误！任务结束日期必须大于任务开始日期"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-#: field:project.project,resource_calendar_id:0
 msgid "Working Time"
 msgstr "工作的时间"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Current"
-msgstr "当前的"
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -465,29 +397,17 @@ msgid "Start Phase"
 msgstr "阶段开始"
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:50
-#, python-format
-msgid "Please Specify Project to be schedule"
-msgstr "请输入要排计划的项目"
-
-#. module: project_long_term
 #: view:project.phase:0
-#: field:project.phase,total_hours:0
 msgid "Total Hours"
 msgstr "总小时数"
 
 #. module: project_long_term
-#: view:project.schedule.tasks:0
-msgid "Task Scheduling completed successfully."
-msgstr "任务日程排列完毕"
-
-#. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute Scheduling of Task for specified project."
-msgstr "为某个特定的项目计算日程"
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
+#: view:project.user.allocation:0
 msgid "Phase"
 msgstr "阶段"
 
@@ -507,17 +427,11 @@ msgstr ""
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
-#: field:project.resource.allocation,date_end:0
+#: field:project.user.allocation,date_end:0
 msgid "End Date"
 msgstr "结束日期"
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-#: field:project.resource.allocation,resource_id:0
-msgid "Resource"
-msgstr "资源"
-
-#. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
 msgstr "名称"
@@ -528,40 +442,38 @@ msgid "Tasks Details"
 msgstr "任务详情"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_resource_resource
-msgid "Resource Detail"
-msgstr "资源明细"
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "时长"
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
-msgstr "调度"
+#: view:project.phase:0
+msgid "Project Users"
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
-#: field:project.resource.allocation,phase_id:0
 #: view:project.task:0
 #: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
 msgid "Project Phase"
 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"
+"               "
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
 msgstr "计算项目阶段"
 
 #. module: project_long_term
-#: field:project.schedule.tasks,msg:0
-msgid "Message"
-msgstr "消息"
-
-#. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
 msgstr "阶段间不能递归引用"
@@ -572,19 +484,14 @@ msgid "Sequence"
 msgstr "序号"
 
 #. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All Projects"
-msgstr "计算所有项目"
-
-#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
 msgstr "成员请假"
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
-#: view:project.phase:0
-#: view:project.schedule.tasks:0
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
 msgid "Schedule Tasks"
 msgstr "任务日程"
 
@@ -594,6 +501,123 @@ msgid "By default in days"
 msgstr "默认按天"
 
 #. module: project_long_term
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr "时长"
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "调度"
+
+#~ msgid "Resources Allocation"
+#~ msgstr "资源分配"
+
+#~ msgid "Long Term Project Management"
+#~ msgstr "长期项目管理"
+
+#~ msgid "Compute Scheduling of Phases"
+#~ msgstr "项目周期计算"
+
+#~ msgid "Resource Allocations"
+#~ msgstr "资源分配"
+
+#~ msgid "Planning"
+#~ msgstr "计划"
+
+#~ msgid "Compute Phase Scheduling"
+#~ msgstr "计算阶段日程"
+
+#~ msgid "Compute Scheduling of phases for all or specified project"
+#~ msgstr "针对所有或特定的一个项目计算阶段周期"
+
+#~ msgid "Availability"
+#~ msgstr "可用"
+
+#~ msgid "Compute Scheduling of Task"
+#~ msgstr "计算任务日程"
+
+#~ msgid "Compute Task Scheduling"
+#~ msgstr "计算项目日程"
+
+#~ msgid "Project Resource Allocation"
+#~ msgstr "项目资源分配"
+
+#~ msgid ""
+#~ "To schedule phases of all or a specified project. It then open a gantt "
+#~ "view.\n"
+#~ "\t           "
+#~ msgstr ""
+#~ "某个或所有项目的阶段日程。会显示一个甘特图。\n"
+#~ "\t           "
+
+#~ msgid ""
+#~ "Availability of this resource for this project phase in percentage (=50%)"
+#~ msgstr "这个资源在此项目阶段的可用性，用百分数表示"
+
+#~ msgid "Project Resources"
+#~ msgstr "项目资源"
+
+#~ msgid "_Ok"
+#~ msgstr "确定(_O)"
+
+#~ msgid "Dates"
+#~ msgstr "日期"
+
+#~ msgid "project.schedule.tasks"
+#~ msgstr "project.schedule.tasks"
+
+#~ msgid "Resource Allocation"
+#~ msgstr "资源分配"
+
+#~ msgid "Schedule and Display info"
+#~ msgstr "日程和显示信息"
+
+#~ 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 phases, 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 the project."
+#~ msgstr ""
+#~ "项目能分成不同的阶段。可以为每个阶段分配资源，定义不同的任务并可以把各个阶段连起来，按日历自动计算计划日期。使用长期计划可以在项目的开始阶段管理人员可用性"
+#~ "、划分每阶段的任务。"
+
+#~ msgid "unknown"
+#~ msgstr "未知的"
+
+#~ msgid "Timetable working hours to adjust the gantt diagram report"
+#~ msgstr "从时间表的工作时间来调整甘特图报表"
+
+#~ msgid "Task Detail"
+#~ msgstr "任务细节"
+
+#~ msgid "Current"
+#~ msgstr "当前的"
+
+#, python-format
+#~ msgid "Please Specify Project to be schedule"
+#~ msgstr "请输入要排计划的项目"
+
+#~ msgid "Responsible"
+#~ msgstr "负责人"
+
+#~ msgid "Resource Detail"
+#~ msgstr "资源明细"
+
+#~ msgid "Compute Scheduling of Task for specified project."
+#~ msgstr "为某个特定的项目计算日程"
+
+#~ msgid "Resource"
+#~ msgstr "资源"
+
+#~ msgid "Task Scheduling completed successfully."
+#~ msgstr "任务日程排列完毕"
+
+#~ msgid "Message"
+#~ msgstr "消息"
+
+#~ msgid "Compute All Projects"
+#~ msgstr "计算所有项目"