[MERGE] branch merged with lp:openobject-addons

bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4

16 files changed, 909 insertions, 627 deletions

diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index 05ad33d52b4..e8934db1549 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -8,66 +8,69 @@ 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"
-"PO-Revision-Date: 2011-02-06 22:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
 msgid "Long Term Project Management"
-msgstr ""
+msgstr "Gestió de projectes a llarg plaç"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of Phases"
-msgstr ""
+msgstr "Calcula la planificació de fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,next_phase_ids:0
 msgid "Next Phases"
-msgstr ""
+msgstr "Següents fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project's Tasks"
-msgstr ""
+msgstr "Tasques del projecte"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
 msgid "Phases"
-msgstr ""
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Error! La data d'inici del projecte ha de ser anterior a la data final del "
+"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 ""
+msgstr "Assignació de recursos"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Displaying settings"
-msgstr ""
+msgstr "Configuració de visualització"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr ""
+msgstr "Horari"
 
 #. module: project_long_term
 #: model:ir.module.module,description:project_long_term.module_meta_information
@@ -90,55 +93,73 @@ msgid ""
 "\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 ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. 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
 msgid "Resource Allocations"
-msgstr ""
+msgstr "Assignació de recursos"
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr ""
+msgstr "Calcular un sol projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,previous_phase_ids:0
 msgid "Previous Phases"
-msgstr ""
+msgstr "Fases prèvies"
 
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "UdM (Unitat de Mesura) és la unitat de mesura per la durada"
 
 #. 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."
-msgstr ""
+msgstr " És calculat pel planificador d'acord a la data d'inici i la durada."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -150,103 +171,103 @@ msgstr ""
 #: field:project.resource.allocation,project_id:0
 #: view:project.task:0
 msgid "Project"
-msgstr ""
+msgstr "Projecte"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: project_long_term
 #: selection:project.phase,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Planning"
-msgstr ""
+msgstr "Planificació"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data limit"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr ""
+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 ""
+msgstr "Calcula planificació de fases"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
-msgstr ""
+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 ""
+msgstr "Disponibilitat"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "C_alcula"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of phases for all or specified project"
-msgstr ""
+msgstr "Calcula planificació de fases per tots o el projecte especificat"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr ""
+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 ""
+msgstr "Calcula planificació de tasques"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr ""
+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 ""
+msgstr "Assignació de recursos del projecte"
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task"
-msgstr ""
+msgstr "Calcula planificació de tasques"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_resource
@@ -254,7 +275,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
 #: view:project.resource.allocation:0
 msgid "Resources"
-msgstr ""
+msgstr "Recursos"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
@@ -263,52 +284,57 @@ msgid ""
 "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           "
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Related Tasks"
-msgstr ""
+msgstr "Tasques relacionades"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
 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%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr ""
+msgstr "força la fase d'inici després d'aquesta data"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Tasques de projecte"
 
 #. module: project_long_term
 #: field:project.phase,resource_ids:0
 msgid "Project Resources"
-msgstr ""
+msgstr "Recursos del projecte"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "_Ok"
-msgstr ""
+msgstr "_D'acord"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Schedule and Display info"
-msgstr ""
+msgstr "Planifica i mostra informació"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -316,21 +342,24 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
+"És calculat pel planificador en funció de la data d'inici o data de "
+"finalització de la fase anterior"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
 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 ""
+msgstr "projecte.planifica.tasques"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
@@ -342,69 +371,77 @@ msgid ""
 "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."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
 #: field:project.resource.allocation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Resource Allocation"
-msgstr ""
+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 ""
+msgstr "Força que la fase acabi abans d'aquesta data"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: project_long_term
 #: field:project.resource.allocation,name:0
 msgid "unknown"
-msgstr ""
+msgstr "desconegut"
 
 #. module: project_long_term
 #: field:project.resource.allocation,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Task Detail"
-msgstr ""
+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 ""
+msgstr "Calcula tasques del projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
-msgstr ""
+msgstr "Restriccions"
 
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Indica l'ordre quan es mostra la llista de fases"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -414,77 +451,78 @@ msgstr ""
 #: view:project.phase:0
 #: field:project.project,phase_ids:0
 msgid "Project Phases"
-msgstr ""
+msgstr "Fases del projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En procés"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Hores restants"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. 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 ""
+msgstr "Horari de treball"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr ""
+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 ""
+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 ""
+msgstr "Total d'hores"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
-msgstr ""
+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 ""
+msgstr "Calcula planificació de tasques per al projecte específic"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 msgid "Phase"
-msgstr ""
+msgstr "Fase"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -495,43 +533,48 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
+"Si la fase es crea, l'estat és \"Esborrany\".\n"
+" Si la fase comença, l'estat canvia a \"En Procés\".\n"
+" Si es necessita revisió, la fase està en estat \"Pendent\".                 "
+"                 \n"
+" Si la fase està acabada, l'estat es fixa en \"Fet\"."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
 #: field:project.resource.allocation,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurs"
 
 #. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Detalls de tasques"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 msgid "Working Period"
-msgstr ""
+msgstr "Horari laboral"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detall del recurs"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 msgid "Scheduling"
-msgstr ""
+msgstr "Planificació"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -540,51 +583,51 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,phase_id:0
 msgid "Project Phase"
-msgstr ""
+msgstr "Fase del projecte"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Cerca fases del projecte"
 
 #. module: project_long_term
 #: field:project.schedule.tasks,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "No es permeten bucles en les fases"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All Projects"
-msgstr ""
+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 ""
+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
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Planifica tasques"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Per defecte en dies"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durada"
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index c65e834d993..80b6f5de74c 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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"
@@ -119,7 +120,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. 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
 msgid "Resource Allocations"
 msgstr "Zuweisung Ressourcen"
@@ -130,7 +130,7 @@ 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:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Tag"
@@ -215,7 +215,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Berechne Terminierung der Phasen"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (Kopie)"
@@ -483,6 +483,7 @@ msgid "Responsible"
 msgstr "Verantwortlicher"
 
 #. 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"
@@ -632,132 +633,3 @@ msgstr "Gem. Standard in Tagen"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Dauer"
-
-#~ msgid "_Compute"
-#~ msgstr "_Berechne"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafter Modellname in der Aktion."
-
-#~ msgid "R.A."
-#~ msgstr "R.Z."
-
-#~ msgid "Usability"
-#~ msgstr "Verfügbarkeit"
-
-#~ msgid ""
-#~ "Usability of this resource for this project phase in percentage (=50%)"
-#~ msgstr "Verfügbarkeit der Ressource für diese Projektphase in Prozent (=50%)"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Ende Datum d. Phase"
-
-#~ msgid "This wizard will schedule phases for all or specified project"
-#~ msgstr "Der Assistent kalkuliert die Phasen für alle oder ein spez. Projekt"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Die ausgew. Firma ist nicht zugelassen für diesen Benutzer"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Fehler! Sie können keine rekursiven anal. Konten erzeugen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#, python-format
-#~ msgid "Project must have members assigned !"
-#~ msgstr "Projekt muss zugew. Team Mitarbeiter haben!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid "Error! Task start-date must be lower then task end-date."
-#~ msgstr "Fehler! Aufgaben Start muss vor dem Ende sein"
-
-#~ msgid "Compute"
-#~ msgstr "Berechne"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Keinen Verantwortlichen zugewiesen!"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Fehler"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Sie müssen einen Verantwortlichen für die Phase zuweisen '%s' !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbez. muss mit einem x_ beginnen und darf keine Sonderzeichen haben "
-#~ "!"
-
-#, python-format
-#~ msgid "Phase must have resources assigned !"
-#~ msgstr "Phase muss zugewiesene Ressource haben!"
-
-#~ msgid "Other Info"
-#~ msgstr "Weitere Info"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Beginn der Phase"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Keine Aufgaben zur Berechnung für Projekt '%s'."
-
-#~ msgid ""
-#~ "A project can be split into the different phases. For each phase, you can "
-#~ "define your resources allocation, describe different tasks and link your "
-#~ "phase to previous and next ones, add date constraints for the automated "
-#~ "scheduling. Use the long term planning in order to planify your available "
-#~ "human resources, convert your phases into a series of tasks when you start "
-#~ "working on it."
-#~ msgstr ""
-#~ "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."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Keine Aufgaben zur Berechnung für Phase: '%s'."
-
-#, python-format
-#~ msgid "Should have Resources Allocation or Project Members!"
-#~ msgstr ""
-#~ "Es sollte eine Ressourcenaufteilung oder Projektmitarbeiter existieren!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Ende Datum d. Phase"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phases"
-#~ msgstr "Beginn der Phase"
-
-#, python-format
-#~ msgid ""
-#~ "Resources should be allocated to your phases and Members should be assigned "
-#~ "to your Project!"
-#~ msgstr ""
-#~ "Ressourcen sollten auf Ihre Projektphasen verteilt werden, "
-#~ "Projektmitarbeiter sollten auf Ihre Projekte verteilt werden."
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index fe7bc15a941..60dd2368ade 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -57,6 +57,7 @@ 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"
@@ -119,7 +120,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "¡Error! No se pueden crear tareas recursivas."
 
 #. 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
 msgid "Resource Allocations"
 msgstr "Asignación de recursos"
@@ -130,7 +130,7 @@ 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:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Día"
@@ -215,7 +215,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calcular planificación de fases"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -483,6 +483,7 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. 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"
@@ -630,36 +631,3 @@ msgstr "Por defecto en días"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Duración"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#~ msgid "Other Info"
-#~ msgstr "Otra información"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Fecha de fin de la fase"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "No existen tareas para calcular en este proyecto '%s'"
-
-#, python-format
-#~ msgid ""
-#~ "Resources should be allocated to your phases and Members should be assigned "
-#~ "to your Project!"
-#~ msgstr ""
-#~ "Los recursos deben de ser asignados a tus fases y los miembros a tu proyecto."
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "¡Debe asignar un reponsable por fase '%s'!"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "¡No hay un reponsable asignado!"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "No existen tareas para el cálculo para la fase '%s'."
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index 7164020c084..c922e098382 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
 msgid "Long Term Project Management"
-msgstr ""
+msgstr "Pitkäaikaisten projektien hallinta"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of Phases"
-msgstr ""
+msgstr "Laske vaiheiden ajoitus"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -47,7 +47,7 @@ msgstr "Vaiheet"
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ryhmittely.."
 
 #. module: project_long_term
 #: constraint:project.project:0
@@ -55,19 +55,20 @@ 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 ""
+msgstr "Resurssien allokointi"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Displaying settings"
-msgstr ""
+msgstr "Näyttöasetukset"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr ""
+msgstr "Ajastus"
 
 #. module: project_long_term
 #: model:ir.module.module,description:project_long_term.module_meta_information
@@ -94,51 +95,50 @@ msgstr ""
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
 
 #. 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
 msgid "Resource Allocations"
-msgstr ""
+msgstr "Resurssien allokoinnit"
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Virhe! Et voi asettaa eskalointia samalle projektille!"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
-msgstr ""
+msgstr "Päivä"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tehtävä"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr ""
+msgstr "Laske yksittäinen projekti"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,previous_phase_ids:0
 msgid "Previous Phases"
-msgstr ""
+msgstr "Aikaisemmat vaiheet"
 
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "Mittayksikkö (UoM) on keston mittayksikkö"
 
 #. 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."
-msgstr ""
+msgstr " Se lasketaan ajastimella alkupäivän ja keston mukaan."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -150,64 +150,64 @@ msgstr ""
 #: field:project.resource.allocation,project_id:0
 #: view:project.task:0
 msgid "Project"
-msgstr ""
+msgstr "Projekti"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Virhe!"
 
 #. module: project_long_term
 #: selection:project.phase,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Peruttu"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Planning"
-msgstr ""
+msgstr "Suunnittelu"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr ""
+msgstr "Määräaika"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr ""
+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 ""
+msgstr "Laske vaiheen ajoitus"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopio)"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,useability:0
 msgid "Availability"
-msgstr ""
+msgstr "Saatavuus"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -218,35 +218,35 @@ msgstr ""
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of phases for all or specified project"
-msgstr ""
+msgstr "Laske vaiheiden ajoitus kaikille tai valituille projekteille"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr ""
+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 ""
+msgstr "Laske tehtävän ajoitus"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr ""
+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 ""
+msgstr "Projektin resurssien allokointi"
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task"
-msgstr ""
+msgstr "Laske tehtävän ajoitus"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_resource
@@ -254,7 +254,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
 #: view:project.resource.allocation:0
 msgid "Resources"
-msgstr ""
+msgstr "Resurssit"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
@@ -267,38 +267,39 @@ msgstr ""
 #. module: project_long_term
 #: help:project.resource.allocation,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Related Tasks"
-msgstr ""
+msgstr "Liittyvät tehtävät"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Dates"
-msgstr ""
+msgstr "Päivämäärät"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
 msgid ""
 "Availability of this resource for this project phase in percentage (=50%)"
 msgstr ""
+"Tämän resurssin saatavuus tälle projektin vaiheelle prosentteina (=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr ""
+msgstr "Pakota vaihe alkamaan tämän päivän jälkeen"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projektin tehtävät"
 
 #. module: project_long_term
 #: field:project.phase,resource_ids:0
 msgid "Project Resources"
-msgstr ""
+msgstr "Projektin resurssit"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
@@ -308,7 +309,7 @@ msgstr ""
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Schedule and Display info"
-msgstr ""
+msgstr "Ajoita ja näytä tiedot"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -316,16 +317,18 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
+"Lasketaan ajastimen avulla käyttäen projektin kestoa ja edellisen vaiheen "
+"loppupäivää."
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
-msgstr ""
+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
@@ -347,64 +350,64 @@ msgstr ""
 #: field:project.phase,date_start:0
 #: field:project.resource.allocation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspvm"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Resource Allocation"
-msgstr ""
+msgstr "Resurssien allokointi"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr ""
+msgstr "pakota vaihe valmistumaan ennen tätä päivää"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottava"
 
 #. module: project_long_term
 #: field:project.resource.allocation,name:0
 msgid "unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #. module: project_long_term
 #: field:project.resource.allocation,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Task Detail"
-msgstr ""
+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 ""
+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 ""
+msgstr "Laske projektin tehtävät"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
-msgstr ""
+msgstr "Rajoitukset"
 
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä listaa vaiheista."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -414,77 +417,78 @@ msgstr ""
 #: view:project.phase:0
 #: field:project.project,phase_ids:0
 msgid "Project Phases"
-msgstr ""
+msgstr "Projektin vaiheet"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Käynnissä"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Jäljelläolevat tunnit"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuuhenkilö"
 
 #. 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 ""
+msgstr "Työaika"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Current"
-msgstr ""
+msgstr "Nykyinen"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr ""
+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 ""
+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 ""
+msgstr "Tunnit yhteensä"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
-msgstr ""
+msgstr "Tehtävien ajoitus tehty onnistuneesti."
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task for specified project."
-msgstr ""
+msgstr "Laske tehtävän ajoitus määritellylle projektille."
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 msgid "Phase"
-msgstr ""
+msgstr "Vaihe"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -500,23 +504,23 @@ msgstr ""
 #: field:project.phase,date_end:0
 #: field:project.resource.allocation,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupvm"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurssi"
 
 #. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Tehtävän yksityiskohdat"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -526,12 +530,12 @@ msgstr ""
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Resurssin yksityiskohdat"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 msgid "Scheduling"
-msgstr ""
+msgstr "Aikataulutus"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -540,51 +544,51 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,phase_id:0
 msgid "Project Phase"
-msgstr ""
+msgstr "Projektin vaihe"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Laske projektin vaiheet"
 
 #. module: project_long_term
 #: field:project.schedule.tasks,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Viesti"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Vaiheissa ei sallita luuppeja"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenssi"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All Projects"
-msgstr ""
+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 ""
+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
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Ajoita tehtävät"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Oletuksena päivissä"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Kesto"
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index ed909261c56..c27df05a77e 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-13 05:12+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\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-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -56,6 +56,7 @@ 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"
@@ -119,7 +120,6 @@ 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.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Allocations des ressources"
@@ -131,7 +131,7 @@ 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:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Jour"
@@ -215,7 +215,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calculer la planification des phases"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
@@ -487,6 +487,7 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. 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"
@@ -634,65 +635,3 @@ msgstr "Par défaut en jour"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Durée"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Pas de tâches à calculer pour le projet '%s'."
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Date de fin de la phase"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Vous devez assigner une personne responsable de la phase '%s' !"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Erreur"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Aucun responsable n'a été assigné !"
-
-#~ msgid "Other Info"
-#~ msgstr "Autres Informations"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Date de début de la phase"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Pas de tâches à calculer pour la phase '%s'."
-
-#~ msgid ""
-#~ "A project can be split into the different phases. For each phase, you can "
-#~ "define your resources allocation, describe different tasks and link your "
-#~ "phase to previous and next ones, add date constraints for the automated "
-#~ "scheduling. Use the long term planning in order to planify your available "
-#~ "human resources, convert your phases into a series of tasks when you start "
-#~ "working on it."
-#~ msgstr ""
-#~ "Un projet peut être divisé en différentes phases. Pour chaque phase, vous "
-#~ "pouvez allouer des ressources, décrire les différentes tâches et relier les "
-#~ "phases les unes aux autres, ajouter des contraintes sur les dates pour "
-#~ "l'ordonnancement automatique. Utilisez la planification à long terme pour "
-#~ "planifier les ressources humaines disponibles, et convertissez vos phases en "
-#~ "une série de tâches quand vous commencez à travailler sur le projet."
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Date de fin de la phase"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phases"
-#~ msgstr "Date de début de la phase"
-
-#, python-format
-#~ msgid ""
-#~ "Resources should be allocated to your phases and Members should be assigned "
-#~ "to your Project!"
-#~ msgstr ""
-#~ "Des ressources devraient être allouées à vos phases et des membres devraient "
-#~ "être affectés à votre projet !"
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index 7a7cab7f6b4..24aeaf414fa 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-08 16:34+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\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-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -56,6 +57,7 @@ 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"
@@ -116,7 +118,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
 
 #. 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
 msgid "Resource Allocations"
 msgstr "Erőforrás elosztások"
@@ -127,7 +128,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Nap"
@@ -210,7 +211,7 @@ 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:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (másolat)"
@@ -477,6 +478,7 @@ msgid "Responsible"
 msgstr "Felelős"
 
 #. 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ő"
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 7bf7563b59e..18f87567782 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -9,14 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-17 07:00+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
+"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: Italian <it@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-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -57,6 +57,7 @@ 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"
@@ -119,7 +120,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Errore ! Non è possibile creare attività ricorsive."
 
 #. 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
 msgid "Resource Allocations"
 msgstr "Allocazione risorse"
@@ -130,7 +130,7 @@ 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:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Giorno"
@@ -214,7 +214,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calcola pianificazione fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -485,6 +485,7 @@ msgid "Responsible"
 msgstr "Responsabile"
 
 #. 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"
@@ -633,24 +634,3 @@ msgstr "Per default in giorni"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Durata"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Nessuna attività da calcolare per il progetto: \"%s\"."
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr ""
-#~ "E' necessario assegnare una persona responsabile per la fase: \"%s\"!"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Errore"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Nessuna attività da calcolare per la fase: \"%s\"."
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Nessuna persona responsabile assegnata!"
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index bb2b4f802e0..9436b7a8ed3 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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"
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
 
 #. 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
 msgid "Resource Allocations"
 msgstr "Resursu iedalīšanas"
@@ -108,7 +108,7 @@ 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:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Diena"
@@ -191,7 +191,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Aprēķināt fāzes grafiku"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
@@ -445,6 +445,7 @@ msgid "Responsible"
 msgstr "Atbildīgais"
 
 #. 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"
@@ -588,36 +589,3 @@ msgstr "Pēc noklusējuma dienās"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Ilgums"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Fāzes beigu datums"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Projektam '%s' nav uzdevumu ko aprēķināt."
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Kļūda"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Nav nozīmēta atbildīgā persona!"
-
-#~ msgid "Other Info"
-#~ msgstr "Cita informācija"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Fāzes sākuma datums"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Fāzei '%s' nav uzdevumu ko aprēķināt"
-
-#, python-format
-#~ msgid "Should have Resources Allocation or Project Members!"
-#~ msgstr "Nepieciešama resursu iedalīšana vai projekta dalībnieki!"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Fāzei '%s' jānozīmē atbildīgo personu!"
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 8f4c4240a5c..304d2d9f122 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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"
@@ -114,7 +115,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Fout! U kunt geen recursieve taken aanmaken."
 
 #. 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
 msgid "Resource Allocations"
 msgstr "Resource toewijzingen"
@@ -125,7 +125,7 @@ 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:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dag"
@@ -209,7 +209,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Fase planning berekenen"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (kopie)"
@@ -475,6 +475,7 @@ msgid "Responsible"
 msgstr "Verantwoordelijke"
 
 #. 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"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index edca6002194..7cee68ee9fc 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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"
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 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
 msgid "Resource Allocations"
 msgstr "Alokacje zasobów"
@@ -108,7 +108,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dzień"
@@ -191,7 +191,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Oblicz planowanie fazy"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
@@ -446,6 +446,7 @@ msgid "Responsible"
 msgstr "Odpowiedzialny"
 
 #. 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"
@@ -594,70 +595,3 @@ msgstr "Domyślnie w dniach"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Czas trwania"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Usability"
-#~ msgstr "Użyteczność"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Błąd"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Compute"
-#~ msgstr "Oblicz"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Other Info"
-#~ msgstr "Inne informacje"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Data rozpoczęcia fazy"
-
-#, python-format
-#~ msgid "No tasks to compute for Project '%s'."
-#~ msgstr "Brak zadań do obliczeń w Projekcie '%s'"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Końcowa data fazy"
-
-#, python-format
-#~ msgid "No responsible person assigned !"
-#~ msgstr "Nie przypisano osoby odpowiedzialnej"
-
-#, python-format
-#~ msgid "Should have Resources Allocation or Project Members!"
-#~ msgstr "Musi być Alokacja zasobów lub Członkowie projektu!"
-
-#, python-format
-#~ msgid "You must assign a responsible person for phase '%s' !"
-#~ msgstr "Musisz podać osobę odpowiedzialną za fazę '%s' !"
-
-#, python-format
-#~ msgid "No tasks to compute for Phase '%s'."
-#~ msgstr "Brak zadań do obliczania dla Fazy '%s'."
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Końcowa data fazy"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phasesStarting Date of the phase"
-#~ msgstr "Data rozpoczęcia fazy"
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index fa981921229..32f88c5b0f5 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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"
 msgstr ""
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Erro! Não se pode criar tarefas recursivamente"
 
 #. 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
 msgid "Resource Allocations"
 msgstr ""
@@ -108,7 +108,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dia"
@@ -191,7 +191,7 @@ msgid "Compute Phase Scheduling"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -445,6 +445,7 @@ msgid "Responsible"
 msgstr "Responsável"
 
 #. 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 ""
@@ -588,26 +589,3 @@ msgstr ""
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Duração"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Erro"
-
-#~ msgid "Other Info"
-#~ msgstr "Outras informações"
-
-#~ msgid "Starting Date of the phase"
-#~ msgstr "Data de início da fase"
-
-#~ msgid "Ending Date of the phase"
-#~ msgstr "Data de fim da fase"
-
-#~ msgid ""
-#~ "It's computed by the scheduler according to the start date and the duration."
-#~ msgstr "Data de fim da fase"
-
-#~ msgid ""
-#~ "It's computed according to the phases order : the start date of the 1st "
-#~ "phase is set by you while the other start dates depend on the end date of "
-#~ "their previous phases"
-#~ msgstr "Data de início da fase"
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index eb8d62470c6..91d14296e43 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
@@ -55,6 +55,7 @@ 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"
@@ -97,7 +98,6 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr "Erro! Você não pode criar tarefas recursivas."
 
 #. 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
 msgid "Resource Allocations"
 msgstr "Alocação de Recursos"
@@ -108,7 +108,7 @@ 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:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
 msgstr "Dia"
@@ -192,7 +192,7 @@ msgid "Compute Phase Scheduling"
 msgstr "Calcular Agendamento da Fase"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -459,6 +459,7 @@ msgid "Responsible"
 msgstr "Responsável"
 
 #. 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"
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
new file mode 100644
index 00000000000..52b11d91817
--- /dev/null
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -0,0 +1,599 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+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"
+"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-09-05 05:54+0000\n"
+"X-Generator: Launchpad (build 13830)\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 "项目周期计算"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "下一阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+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
+msgid "Group By..."
+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 "资源分配"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "显示设置"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+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
+#, python-format
+msgid "Day"
+msgstr "天"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "任务"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "计算单个项目"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "上一阶段"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+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."
+msgstr " 这个日期是由开始日期和计划日数根据日历计算出来的。"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: 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
+msgid "Project"
+msgstr "项目"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "错误！"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: project_long_term
+#: help:project.resource.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
+#: 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
+#, 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 "可用"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+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 "针对所有或特定的一个项目计算阶段周期"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+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_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           "
+msgstr ""
+"某个或所有项目的阶段日程。会显示一个甘特图。\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "开始日期"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "相关任务"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr "这个资源在此项目阶段的可用性，用百分数表示"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "强制项目在此日期之后开始"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+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 "
+"the previous phase."
+msgstr "这个日期根据项目的开始日期或前一个阶段的结束日期结算而来"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "月份"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+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."
+msgstr ""
+"项目能分成不同的阶段。可以为每个阶段分配资源，定义不同的任务并可以把各个阶段连起来，按日历自动计算计划日期。使用长期计划可以在项目的开始阶段管理人员可用性"
+"、划分每阶段的任务。"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.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
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+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
+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 "计算任务计划"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "限制"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "输入序号用于阶段列表排序"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "项目阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "已完成"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "取消(&C)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "进行中"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "剩余小时数"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+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 "当前的"
+
+#. module: project_long_term
+#: view:project.phase:0
+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 "为某个特定的项目计算日程"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "阶段"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"新建的阶段状态是草稿\n"
+"开始后的阶段状态是正在进行中\n"
+"如果需要复核则状态为等待中\n"
+"已结束的阶段状态是完成"
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.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 "名称"
+
+#. module: project_long_term
+#: view:project.phase:0
+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 "资源明细"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+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
+msgid "Project Phase"
+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 "阶段间不能递归引用"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+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
+msgid "Schedule Tasks"
+msgstr "任务日程"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "默认按天"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "时长"
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 779c7f6d062..6c5ef7890bf 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -23,6 +23,7 @@ from datetime import datetime
 from tools.translate import _
 from osv import fields, osv
 from resource.faces import task as Task 
+from operator import itemgetter
 
 class project_phase(osv.osv):
     _name = "project.phase"
@@ -119,7 +120,7 @@ class project_phase(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
-        'total_hours': fields.function(_compute, method=True, string='Total Hours'),
+        'total_hours': fields.function(_compute, string='Total Hours'),
      }
     _defaults = {
         'responsible_id': lambda obj,cr,uid,context: uid,
@@ -398,7 +399,7 @@ class project_resource_allocation(osv.osv):
             res[allocation.id] = name
         return res
     _columns = {
-        'name': fields.function(get_name, method=True, type='char', size=256),
+        'name': fields.function(get_name, type='char', size=256),
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
         'project_id': fields.related('phase_id', 'project_id', type='many2one', relation="project.project", string='Project', store=True),
@@ -729,7 +730,7 @@ class project_task(osv.osv):
         if context is None:
             context = {}
         task = self.browse(cr, uid, task_id, context=context)
-        duration = str(task.planned_hours )+ 'H'
+        duration = str(task.planned_hours)+ 'H'
         str_resource = False
         parent = task.parent_ids
         if task.phase_id.resource_ids:
@@ -743,10 +744,12 @@ class project_task(osv.osv):
             effort = \'%s\'
             resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            if parent:
+            if task.child_ids:
+                seq = [[child.planned_hours, child.id] for child in task.child_ids]
+                seq.sort(key=itemgetter(0))
                 s +='''
             start = up.Task_%s.end
-'''%(parent[0].id)
+    '''%(seq[-1][1])
         else:
             s = '''
     def Task_%s():
@@ -754,10 +757,12 @@ class project_task(osv.osv):
         effort = \'%s\'
         resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            if parent:
+            if task.child_ids:
+                seq = [[child.planned_hours, child.id] for child in task.child_ids]
+                seq.sort(key=itemgetter(0))
                 s +='''
         start = up.Task_%s.end
-'''%(parent[0].id)
+'''%(seq[-1][1])
         s += '\n'
         return s
 project_task()
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b720da13654..8d976517a34 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -220,7 +220,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:state in ('pending')" string="Project Phases">
+                <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases">
                     <field name="name"/>
                     <field name="project_id" on_change="onchange_project(project_id)"/>
                     <field name="responsible_id"/>
@@ -267,7 +267,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress Phases" icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, In Progress and Pending Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_long_term/test/test_schedule_tasks_case1.yml b/addons/project_long_term/test/test_schedule_tasks_case1.yml
index febb2aa3576..d40b61d6b3a 100644
--- a/addons/project_long_term/test/test_schedule_tasks_case1.yml
+++ b/addons/project_long_term/test/test_schedule_tasks_case1.yml
@@ -1,20 +1,9 @@
 -
   In order to test scheduling of tasks, I create four tasks with different sequences and schedule them.
 - 
-  I create address for first user.
-- 
-  !record {model: res.partner.address, id: res_partner_address_user0}:
-    name: User 1
-- 
-  I create address for second user.
-- 
-  !record {model: res.partner.address, id: res_partner_address_user1}:
-    name: User 2    
-- 
   I create first user.
 - 
   !record {model: res.users, id: res_users_user0}:
-    address_id: res_partner_address_user0
     company_id: base.main_company
     context_lang: en_US
     groups_id:
@@ -27,7 +16,6 @@
   I create second user.
 - 
   !record {model: res.users, id: res_users_user1}:
-    address_id: res_partner_address_user1
     company_id: base.main_company
     context_lang: en_US
     groups_id: