[MERGE] Sync wirth trunk.

bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42

4 files changed, 15 insertions, 15 deletions

diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 27dd196fc8b..3b94ca29571 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-13 23:26+0000\n"
-"Last-Translator: Bhumika (OpenERP) <sbh@tinyerp.com>\n"
+"PO-Revision-Date: 2012-12-17 12:48+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -83,12 +83,12 @@ msgstr "Fases Agenda"
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "Ação"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -147,7 +147,7 @@ msgstr "Fases em progresso"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
@@ -159,7 +159,7 @@ msgstr "Por favor, especifique um projeto para agendar."
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -416,7 +416,7 @@ msgstr "Dá a ordem da sequência ao exibir uma lista de fases."
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "Tarefas"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
@@ -459,7 +459,7 @@ msgstr "Mês"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta analítica"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 419aa5e3381..e53ff9ed253 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -20,8 +20,8 @@
 ##############################################################################
 
 from datetime import datetime
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
 from openerp.addons.resource.faces import task as Task
 
 class project_phase(osv.osv):
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 85ab158e0b2..c9aa7eb3573 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
 
 class project_compute_phases(osv.osv_memory):
     _name = 'project.compute.phases'
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index 24240f90a54..f21dab8a6d2 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from openerp.osv import fields, osv
 
 class project_compute_tasks(osv.osv_memory):
     _name = 'project.compute.tasks'