[MERGE] fix the phone call to opportunity to quotation

lp bug: https://launchpad.net/bugs/1017353 fixed

bzr revid: api@openerp.com-20121113134911-gd4o1zj6ixtu83hm

27 files changed, 136 insertions, 112 deletions

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 2968a5b035d..3a3307d2898 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -58,7 +58,6 @@ Features:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '001227470751077315069',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index e4859c5f75b..28ece74411a 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -128,7 +128,7 @@ msgstr "تكون وحدة القياس هي وحدة لقياس الفترة"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "التخطيط للمستخدمين"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index afd8216df7d..30fb50785c1 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..2353ea5bc69 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..bd1bc4e9a50 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..4617914591c 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..a8de1beef4c 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..7bbd029bcad 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..b80e7a93b66 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..63871a8c2dc 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..dc70560d097 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..80396ca4e01 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..046b3d1b7cb 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..92aa26a0a81 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..c519ca3172e 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..1ca89e27bb4 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..169042c7a81 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -379,7 +379,7 @@ msgstr "Annuleren"
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -433,7 +433,7 @@ msgid ""
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
 "Als de fase is gemaakt is de status 'Concept'.\n"
-" Als de fase is gestart, wordt de status 'Loopt'.\n"
+" Als de fase is gestart, wordt de status 'In behandeling'.\n"
 " Als opnieuw bekeken moet worden, wordt de fase status 'Wachtend'.           "
 "                       \n"
 " Als de fase voorbij is, wordt de status op 'Voltooid' gezet."
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index bec5bb71d3e..2e7d172517a 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..f63a962e8c9 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..50e4e716fd9 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-20 19:35+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:36+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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,12 +57,12 @@ 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
 msgid "Displaying Settings"
-msgstr ""
+msgstr "Exibindo Configurações"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project: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..e297bec57c8 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..2c843f44110 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..904c67b3674 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..53e1364a57c 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-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\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..db6c532d503 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -116,8 +116,8 @@ class project_phase(osv.osv):
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The resources on the project can be computed automatically by the scheduler."),
         'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', 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\'.'),
+                                  help='If the phase is created the status \'Draft\'.\n If the phase is started, the status becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' status.\
+                                  \n If the phase is over, the status is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
      }
     _defaults = {
@@ -138,7 +138,7 @@ class project_phase(osv.osv):
         if default is None:
             default = {}
         if not default.get('name', False):
-            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+            default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name))
         return super(project_phase, self).copy(cr, uid, id, default, context)
 
     def set_draft(self, cr, uid, ids, *args):
@@ -227,7 +227,7 @@ class project(osv.osv):
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    
+
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -250,7 +250,7 @@ class project(osv.osv):
                 # Maybe it's better to update than unlink/create if it already exists ?
                 p = getattr(project_gantt, 'Phase_%d' % (phase.id,))
 
-                self.pool.get('project.user.allocation').unlink(cr, uid, 
+                self.pool.get('project.user.allocation').unlink(cr, uid,
                     [x.id for x in phase.user_ids],
                     context=context
                 )
@@ -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:
@@ -292,7 +292,7 @@ account_analytic_account()
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
-        'phase_id': fields.many2one('project.phase', 'Project Phase'),
+        'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"),
     }
 project_task()
 
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index bca8231fdaa..fda481d5a11 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -7,6 +7,7 @@
 
         <record id="project.project_project_1" model="project.project">
             <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
+            <field name="use_phases" eval="True"/>
         </record>
 
         <!-- Project Phases -->
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..52eb5d80a3a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -83,24 +83,28 @@
 
 
         <!-- Project Phase -->
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+
+        <record id="act_project_phases" model="ir.actions.act_window">
+            <field name="res_model">project.phase</field>
+            <field name="view_type">form</field>
+            <field name="name">Phases</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
 
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <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 name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
             </field>
         </record>
@@ -116,10 +120,21 @@
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_phases.raw_value"
-                        name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
+                        name="%(act_project_phases)d" type="action">
+                        <span t-if="record.phase_count.raw_value gt 1">Phases(<field name="phase_count"/>)</span>
+                        <span t-if="record.phase_count.raw_value lt 2">Phase(<field name="phase_count"/>)</span>
+                    </a>
                 </xpath>
             </field>
         </record>
+        
+        <record id="project_phase_task_list" model="ir.actions.act_window">
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="name">Tasks</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}</field>
+        </record>
 
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
@@ -135,6 +150,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
+                    <button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
@@ -333,25 +349,15 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
-            id="project_phase_task_list"
-            name="Related Tasks"
-            res_model="project.task"
-            src_model="project.phase"
-            view_mode="tree,form"/>
-
         <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <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>