[MERGE] trunk

bzr revid: abo@openerp.com-20120924153547-i1r9l0i5asjhml0k

26 files changed, 118 insertions, 100 deletions

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 3882eddbdb5..2968a5b035d 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,14 +20,14 @@
 ##############################################################################
 
 {
-    "name": "Long Term Projects",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"],
-    "depends": ["project"],
-    "description": """
+    'name': 'Long Term Projects',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Project Management',
+    'images': ['images/project_phase_form.jpeg','images/project_phases.jpeg', 'images/resources_allocation.jpeg'],
+    'depends': ['project'],
+    'description': """
 Long Term Project management module that tracks planning, scheduling, resources allocation.
 ===========================================================================================
 
@@ -44,18 +44,17 @@ Features:
     * Schedule Tasks: All the tasks which are in draft, pending and open state
       are scheduled with taking the phase's start date.
     """,
-    "init_xml": [],
-    "demo_xml": ["project_long_term_demo.xml"],
-    "test": [
+    'demo': ['project_long_term_demo.xml'],
+    'test': [
           'test/phase_process.yml',
           'test/task_process.yml',
     ],
-    "update_xml": [
-        "security/ir.model.access.csv",
-        "project_long_term_view.xml",
-        "project_long_term_workflow.xml",
-        "wizard/project_compute_phases_view.xml",
-        "wizard/project_compute_tasks_view.xml",
+    'data': [
+        'security/ir.model.access.csv',
+        'project_long_term_view.xml',
+        'project_long_term_workflow.xml',
+        'wizard/project_compute_phases_view.xml',
+        'wizard/project_compute_tasks_view.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index e4859c5f75b..43a951e3222 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.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: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index afd8216df7d..674c38a1b5b 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.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: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index 5b6ce585453..751b47c3eec 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.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: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index f53e34c0cb6..53dd34c174f 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index 82f0c276df8..f6aa74f4186 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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index cd54b36536f..87935703b57 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 "Language: es\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
index cec5a0f9a46..e344d14e458 100644
--- a/addons/project_long_term/i18n/es_EC.po
+++ b/addons/project_long_term/i18n/es_EC.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index e7209e67bde..baaf3dfb806 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.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: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index c55e3582939..f9ff359fe15 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index c634626e1ed..7ec043b8e8d 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index a0721aa6bbf..4bce37309af 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 31cca39375b..8a20a31b164 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index b6942982ae9..560f21fc98e 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 50c53125eef..d7b9deb19f5 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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
index 6a35bb779e4..0cc208e3611 100644
--- a/addons/project_long_term/i18n/mn.po
+++ b/addons/project_long_term/i18n/mn.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 0e84060aaba..e889f74d09b 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: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index bec5bb71d3e..0d85c0e256f 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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 7aca4caa234..e1118b072e2 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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index 344a22a99e4..5bc24758372 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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -42,7 +42,7 @@ msgstr "Agrupar Por..."
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr ""
+msgstr "Usuários não Associados"
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -57,7 +57,7 @@ msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
 #. module: project_long_term
 #: view:project.phase:0
 msgid "In Progress Phases"
-msgstr ""
+msgstr "Fases em Progresso"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -88,7 +88,7 @@ msgstr "Dia"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_user_allocation
 msgid "Phase User Allocation"
-msgstr ""
+msgstr "Alocação de Usuário nas Fases"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
@@ -105,6 +105,12 @@ msgid ""
 "users, convert your phases into a series of tasks when you start working on "
 "the project."
 msgstr ""
+"Um projeto pode ser dividido em diferentes fases. Para cada fase, você pode "
+"definir a alocação de usuários, descrever diferentes tarefas e associar cada "
+"fase a uma fase anterior ou posterior, adicionar restrições de data para o "
+"agendamento automático. Use o planejamento a longo prazo para detalhar seus "
+"usuários disponíveis, converter suas fases em uma série de tarefas quando "
+"você começar a trabalhar no projeto."
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
@@ -128,7 +134,7 @@ msgstr "UdM (Unidade de Medida) é a unidade de medida para Duração"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "Planejamento de Usuários"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -173,7 +179,7 @@ msgstr "Prazo Final"
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All My Projects"
-msgstr ""
+msgstr "Calcular Todos os Meus Projetos"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -190,7 +196,7 @@ msgstr " (cópia)"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Project User Allocation"
-msgstr ""
+msgstr "Alocação de Usuários no Projeto"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -202,18 +208,18 @@ msgstr "Status"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "C_alcular"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: project_long_term
 #: help:project.phase,progress:0
 msgid "Computed based on related tasks"
-msgstr ""
+msgstr "Calculada com base em tarefas relacionadas"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -234,7 +240,7 @@ msgstr "Recursos"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "My Projects"
-msgstr ""
+msgstr "Meus Projetos"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
@@ -249,13 +255,13 @@ msgstr "Tarefas Relacionadas"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "New Phases"
-msgstr ""
+msgstr "Novas Fases"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Please specify a project to schedule."
-msgstr ""
+msgstr "Por favor especifique um projeto para agendar"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -289,7 +295,7 @@ msgstr "Data de Início da Fase deve ser inferior a data final de fase."
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Month"
-msgstr ""
+msgstr "Mês de Início"
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
@@ -307,6 +313,8 @@ msgstr "forçar a fase para terminar antes dessa data"
 msgid ""
 "The ressources on the project can be computed automatically by the scheduler"
 msgstr ""
+"Os recursos neste projeto podem ser calculados automaticamente pelo "
+"agendador."
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -316,7 +324,7 @@ msgstr "Provisório"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Pending Phases"
-msgstr ""
+msgstr "Fases Pendentes"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -333,7 +341,7 @@ msgstr "Usuário"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Tarefas do Projeto Calculadas"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -343,7 +351,7 @@ msgstr "Restrições"
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Dá a ordem da seqüência ao exibir uma lista de fases."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -380,7 +388,7 @@ msgstr "Horas Restantes"
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -392,7 +400,7 @@ msgstr "Tempo Trabalhado"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr ""
+msgstr "Planejar Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -407,7 +415,7 @@ msgstr "Horas Totais"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -423,6 +431,10 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
+"Se a fase for criada com a situação 'Provisória'.\n"
+" Se a fase for iniciada, a situação muda para 'Em Progresso'.\n"
+" Se for necessário uma revisão a fase ficará em 'Pendente'.\n"
+" Se a fase for concluída, a situação é alterada para 'Concluída'."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
@@ -448,7 +460,7 @@ msgstr "Duração"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project Users"
-msgstr ""
+msgstr "Usuários do Projeto"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -466,16 +478,19 @@ msgid ""
 "view.\n"
 "               "
 msgstr ""
+"Para agendar fases de todos ou de um projeto específico. Então abrirá a "
+"visão em gantt.\n"
+"               "
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Fases Calculadas do Projeto"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Loops em fases não é permitido"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -485,25 +500,25 @@ msgstr "Sequência"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Ausências de Recurso"
 
 #. 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
 #: view:project.compute.tasks:0
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Agenda de Tarefas"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Por padrão em dias"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr ""
+msgstr "Forçar Usuários Atribuídos"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -599,3 +614,6 @@ msgstr "Agendamento"
 
 #~ msgid "Message"
 #~ msgstr "Mensagem"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Mostrando configurações"
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index cc92d00cbc6..1eafda8f36e 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index 04a335c2a9a..f23c8519d5b 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index 3b286bfe63d..56879dcd683 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 7f1c5ddf0d0..42be528437a 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index d5ac3868a5e..2eab5fa6ac6 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -273,9 +273,9 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+        'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..55a91b36f08 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -96,11 +96,14 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr="//div[@name='options_active']" position='inside'>
+                       <field name="use_phases" class="oe_inline"/>
+                       <label for="use_phases"/>
+                </xpath>
+                <xpath expr="//div[@name='buttons']" position='inside'>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
             </field>
         </record>
@@ -347,11 +350,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_phases"/>
+                    <label for="use_phases"/>
                 </xpath>
             </field>
         </record>