[MERGE] Sync wirth trunk.

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

3 files changed, 13 insertions, 14 deletions

diff --git a/addons/process/__init__.py b/addons/process/__init__.py
index d2169ef4a36..30a81513bf7 100644
--- a/addons/process/__init__.py
+++ b/addons/process/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import process
-import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index 2799e3c92a0..0f0787a64af 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-12-09 07:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-17 12:24+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -40,7 +40,7 @@ msgstr "Menu Relacionado"
 #. module: process
 #: selection:process.node,kind:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -138,7 +138,7 @@ msgstr "Transições do Fluxo de Trabalho"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "Last modified by:"
-msgstr ""
+msgstr "Última alteração por:"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -214,14 +214,14 @@ msgstr "Notas"
 #: code:addons/process/static/src/xml/process.xml:88
 #, python-format
 msgid "Edit Process"
-msgstr ""
+msgstr "Editar processo"
 
 #. module: process
 #. openerp-web
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "N/A"
-msgstr ""
+msgstr "N/D"
 
 #. module: process
 #: view:process.process:0
@@ -353,7 +353,7 @@ msgstr "Transições em Saída"
 #: code:addons/process/static/src/xml/process.xml:36
 #, python-format
 msgid "Notes:"
-msgstr ""
+msgstr "Notas:"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -377,7 +377,7 @@ msgstr "Método do Objeto"
 #: code:addons/process/static/src/xml/process.xml:77
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "Selecionar"
 
 #~ msgid "State"
 #~ msgstr "Estado"
diff --git a/addons/process/process.py b/addons/process/process.py
index fa7596287a3..09405bfbe67 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import pooler
-import tools
-from osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields, osv
 
 class Env(dict):