openerp-dev-web team mailing list archive

Thread
Date

lp:~openerp-dev/openobject-server/6.0-bug-719406-empty-record-rules-vmt into lp:openobject-server

To: mp+51519@xxxxxxxxxxxxxxxxxx
From: "Vo Minh Thu \(OpenERP\)" <vmt@xxxxxxxxxxx>
Date: Mon, 28 Feb 2011 11:48:29 -0000
Reply-to: mp+51519@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Vo Minh Thu (OpenERP) has proposed merging lp:~openerp-dev/openobject-server/6.0-bug-719406-empty-record-rules-vmt into lp:openobject-server.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #719406 Record rules with domain blank or [] result in application error
  https://bugs.launchpad.net/bugs/719406

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-719406-empty-record-rules-vmt/+merge/51519
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-719406-empty-record-rules-vmt/+merge/51519
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.0-bug-719406-empty-record-rules-vmt.

=== added file 'debian/po/he.po'
--- debian/po/he.po	1970-01-01 00:00:00 +0000
+++ debian/po/he.po	2011-02-28 11:47:53 +0000
@@ -0,0 +1,39 @@
+# Hebrew translation for openobject-server
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2011-02-22 19:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-23 06:17+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Dedicated system account for the Open ERP server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid ""
+"The Open ERP server must use a dedicated account for its operation so that "
+"the system's security is not compromised by running it with superuser "
+"privileges."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr ""

=== renamed file 'debian/po/he.po' => 'debian/po/he.po.moved'
=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2011-02-16 05:00:27 +0000
+++ debian/po/pt_BR.po	2011-02-28 11:47:53 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-11-07 07:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-23 22:44+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-02-16 05:00+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-24 06:15+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
 
 #. Type: string
 #. Description
@@ -39,4 +49,4 @@
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Please choose that account's username."
-msgstr "Escolha um usuÃ¡rio para a conta"
+msgstr "Por favor, escolha um usuÃ¡rio para a conta."

=== modified file 'openerp/addons/base/i18n/nl.po'
--- openerp/addons/base/i18n/nl.po	2011-02-03 23:00:23 +0000
+++ openerp/addons/base/i18n/nl.po	2011-02-28 11:47:53 +0000
@@ -7,14 +7,24 @@
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-01-19 08:35+0000\n"
 "Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-21 08:40+0000\n"
+"Last-Translator: Niels Huylebroeck <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-01-20 04:48+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-22 14:26+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: view:ir.filters:0
@@ -2905,7 +2915,7 @@
 #. module: base
 #: view:res.users:0
 msgid "Default Filters"
-msgstr "Stadaard filters"
+msgstr "Standaard filters"
 
 #. module: base
 #: field:res.request.history,name:0

=== modified file 'openerp/addons/base/i18n/pt_BR.po'
--- openerp/addons/base/i18n/pt_BR.po	2011-02-21 10:32:35 +0000
+++ openerp/addons/base/i18n/pt_BR.po	2011-02-28 11:47:53 +0000
@@ -7,14 +7,24 @@
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-02-02 23:59+0000\n"
 "Last-Translator: Adriano Prado <adrianojprado@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-02-26 19:42+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: <pt@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-02-05 04:59+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-27 06:22+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: view:ir.filters:0
@@ -764,7 +774,7 @@
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Request Reference Types"
-msgstr "Tipos de SolicitaÃ§Ã£o de ReferÃªncia"
+msgstr "Tipos de ReferÃªncia das Mensagens"
 
 #. module: base
 #: view:ir.values:0
@@ -1025,7 +1035,7 @@
 #. module: base
 #: view:res.request:0
 msgid "Request Date"
-msgstr "Data de RequisiÃ§Ã£o"
+msgstr "Data da Mensagem"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_dasboard
@@ -1349,7 +1359,7 @@
 #. module: base
 #: field:res.partner.category,parent_left:0
 msgid "Left parent"
-msgstr ""
+msgstr "Parentese esquerdo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_widget_act_window
@@ -2183,6 +2193,9 @@
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"A ordem especificada Ã© invÃ¡lida. Uma ordem vÃ¡lida Ã© uma lista de nomes de "
+"campos separada por vÃrgula (opcionalmente seguida por ASC/DESC para "
+"crescente ou descrescente)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -2441,7 +2454,7 @@
 #. module: base
 #: model:res.country,name:base.yt
 msgid "Mayotte"
-msgstr ""
+msgstr "Maiote"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:597
@@ -2543,7 +2556,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Urdu / Ø§Ø±Ø¯Ùˆ"
-msgstr ""
+msgstr "Urdu / Ø§Ø±Ø¯Ùˆ"
 
 #. module: base
 #: field:res.company,name:0
@@ -3519,6 +3532,12 @@
 "Would your payment have been carried out after this mail was sent, please "
 "consider the present one as void."
 msgstr ""
+"Por favor, repare que as seguintes cobranÃ§as estÃ£o em aberto. Se o pagamento "
+"jÃ¡ foi realizado, pedimos gentilmente que nos envie o comprovante. Se o "
+"pagamento realmente estiver em aberto, entre em contato para conversarmos.   "
+"                       \n"
+"Se o pagamento foi realizado apÃ³s a postagem desta correspondÃªncia, favor "
+"desconsiderar esta mensagem."
 
 #. module: base
 #: model:res.country,name:base.mx
@@ -3690,6 +3709,8 @@
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
+"A expressÃ£o em OpÃ§Ãµes de SeleÃ§Ã£o nÃ£o Ã© uma expressÃ£o Python vÃ¡lida. Favor "
+"entrar com uma expressÃ£o no formato [('chave','DescriÃ§Ã£o'),...]"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -3719,7 +3740,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Japanese / æ—¥æœ¬èªž"
-msgstr ""
+msgstr "Japanese / æ—¥æœ¬èªž"
 
 #. module: base
 #: help:workflow.transition,act_from:0
@@ -3849,7 +3870,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / EspaÃ±ol (BO)"
-msgstr ""
+msgstr "Spanish (BO) / EspaÃ±ol (BO)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -3889,7 +3910,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Gujarati / àª—à«àªœàª°àª¾àª¤à«€"
-msgstr ""
+msgstr "Gujarati / àª—à«àªœàª°àª¾àª¤à«€"
 
 #. module: base
 #: code:addons/base/module/module.py:257
@@ -4084,7 +4105,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Latvian / latvieÅ¡u valoda"
-msgstr ""
+msgstr "Latvian / latvieÅ¡u valoda"
 
 #. module: base
 #: view:res.config:0
@@ -4408,7 +4429,7 @@
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Imagem do Ãcone Web (hover)"
 
 #. module: base
 #: view:base.module.import:0
@@ -4975,7 +4996,7 @@
 #. module: base
 #: model:res.country,name:base.bf
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burquina Fasso"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
@@ -5561,7 +5582,7 @@
 #. module: base
 #: view:res.request.link:0
 msgid "Request Link"
-msgstr "Link"
+msgstr "Link da Mensagem"
 
 #. module: base
 #: view:ir.attachment:0
@@ -6231,7 +6252,7 @@
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year with Century: %(year)s"
-msgstr ""
+msgstr "Ano atual (4 digitos): %(year)s"
 
 #. module: base
 #: field:ir.exports,export_fields:0
@@ -6391,6 +6412,8 @@
 msgid ""
 "We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
 msgstr ""
+"Sugerimos a recarga do menu para a visualizaÃ§Ã£o dos novos menus (Ctrl+T, "
+"depois Ctrl+R)."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
@@ -6422,6 +6445,8 @@
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
+"O OpenERP irÃ¡ adicionar automaticamente alguns '0' Ã  esquerda do 'PrÃ³ximo "
+"NÃºmero' para chegar ao preenchimento requerido."
 
 #. module: base
 #: view:res.lang:0
@@ -6484,7 +6509,7 @@
 #. module: base
 #: view:res.lang:0
 msgid "%m - Month number [01,12]."
-msgstr ""
+msgstr "%m - NÃºmero do mÃªs [01,12]."
 
 #. module: base
 #: field:res.bank,city:0
@@ -6520,7 +6545,7 @@
 #: field:res.partner,email:0
 #: field:res.users,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -6542,7 +6567,7 @@
 #: view:ir.model.data:0
 #: model:ir.ui.menu,name:base.ir_model_data_menu
 msgid "Object Identifiers"
-msgstr ""
+msgstr "Identificadores de Objeto"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_title_partner
@@ -6550,6 +6575,9 @@
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
+"Gerencia o nome de formaÃ§Ã£o dos parceiros que vocÃª deseja que estejam "
+"disponÃveis no sistema. Um nome de formaÃ§Ã£o Ã© o tipo legal da empresa: "
+"Limitada (Ltda), S.A., etc."
 
 #. module: base
 #: view:base.language.export:0
@@ -6563,6 +6591,8 @@
 "You can not read this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"VocÃª nÃ£o pode ler este documento (%s)! Certifique-se de que seu usuÃ¡rio "
+"pertence a um destes grupos: %s."
 
 #. module: base
 #: view:res.bank:0
@@ -6596,7 +6626,7 @@
 #. module: base
 #: view:base.module.update:0
 msgid "Module update result"
-msgstr ""
+msgstr "Resultado da atualizaÃ§Ã£o de mÃ³dulo"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6618,7 +6648,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CR) / EspaÃ±ol (CR)"
-msgstr ""
+msgstr "Spanish (CR) / EspaÃ±ol (CR)"
 
 #. module: base
 #: field:res.currency.rate,rate:0
@@ -6643,7 +6673,7 @@
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "Ferramentas"
 
 #. module: base
 #: model:res.country,name:base.kn
@@ -6658,6 +6688,9 @@
 "for the currency: %s \n"
 "at the date: %s"
 msgstr ""
+"Nenhuma taxa encontrada \n"
+"para a moeda: %s \n"
+"na data: %s"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view_custom
@@ -6665,6 +6698,8 @@
 "Customized views are used when users reorganize the content of their "
 "dashboard views (via web client)"
 msgstr ""
+"ExibiÃ§Ãµes personalizadas sÃ£o usadas quando o usuÃ¡rio reorganiza o conteÃºdo "
+"da exibiÃ§Ã£o em painÃ©is (via cliente web)"
 
 #. module: base
 #: field:ir.model,name:0
@@ -6702,7 +6737,7 @@
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr ""
+msgstr "O modelo pertence a este campo"
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -6712,7 +6747,7 @@
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequences Type"
-msgstr ""
+msgstr "Tipo de SequÃªncias"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-act
@@ -6736,7 +6771,7 @@
 #: model:ir.actions.act_window,name:base.res_log_act_window
 #: model:ir.ui.menu,name:base.menu_res_log_act_window
 msgid "Client Logs"
-msgstr ""
+msgstr "Logs do Cliente"
 
 #. module: base
 #: model:res.country,name:base.al
@@ -6755,6 +6790,8 @@
 "You cannot delete the language which is Active !\n"
 "Please de-activate the language first."
 msgstr ""
+"VocÃª nÃ£o pode excluir um idioma que estÃ¡ Ativo!\n"
+"Favor desativar o idioma primeiramente."
 
 #. module: base
 #: view:base.language.install:0
@@ -6763,6 +6800,8 @@
 "Please be patient, this operation may take a few minutes (depending on the "
 "number of modules currently installed)..."
 msgstr ""
+"Por favor seja paciente. Esta operaÃ§Ã£o pode demorar poucos minutos "
+"(dependendo do nÃºmero de mÃ³dulos instalados atualmente)..."
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -6787,12 +6826,14 @@
 #: view:base.module.import:0
 #: view:base.module.update:0
 msgid "Open Modules"
-msgstr ""
+msgstr "MÃ³dulos Abertos"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
 msgstr ""
+"Gerencia os registros de bancos que vocÃª quiser que sejam usados pelo "
+"sistema."
 
 #. module: base
 #: view:base.module.import:0
@@ -6810,6 +6851,8 @@
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another field"
 msgstr ""
+"Caminho (diretÃ³rio) para o arquivo de relatÃ³rio principal (dependendo do "
+"Tipo de RelatÃ³rio) ou NULL se o conteÃºdo estiver em outro campo"
 
 #. module: base
 #: model:res.country,name:base.la
@@ -6836,6 +6879,8 @@
 "The sum of the data (2nd field) is null.\n"
 "We can't draw a pie chart !"
 msgstr ""
+"A soma dos dados (segundo campo) Ã© nula.\n"
+"NÃ£o posso montar o grÃ¡fico de pizza !"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_lunch_reporting
@@ -6857,7 +6902,7 @@
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other Proprietary"
-msgstr ""
+msgstr "Outro ProprietÃ¡rio"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -6868,12 +6913,12 @@
 #: code:addons/orm.py:412
 #, python-format
 msgid "The read_group method is not implemented on this object !"
-msgstr ""
+msgstr "O mÃ©todo read_group nÃ£o estÃ¡ implementado neste objeto!"
 
 #. module: base
 #: view:ir.model.data:0
 msgid "Updatable"
-msgstr ""
+msgstr "AtualizÃ¡vel"
 
 #. module: base
 #: view:res.lang:0
@@ -6888,7 +6933,7 @@
 #. module: base
 #: field:workflow.transition,group_id:0
 msgid "Group Required"
-msgstr ""
+msgstr "O Grupo Ã© ObrigatÃ³rio"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -6911,17 +6956,19 @@
 "Enable this if you want to execute missed occurences as soon as the server "
 "restarts."
 msgstr ""
+"Ative isto se vocÃª quiser executar ocorrÃªncias faltantes assim que o "
+"servidor reiniciar."
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Start update"
-msgstr ""
+msgstr "Iniciar atualizaÃ§Ã£o"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
 #, python-format
 msgid "Contract validation error"
-msgstr ""
+msgstr "Erro de validaÃ§Ã£o de Contrato"
 
 #. module: base
 #: field:res.country.state,name:0
@@ -6948,7 +6995,7 @@
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_miss
 msgid "Mss"
-msgstr ""
+msgstr "Sra"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -6958,7 +7005,7 @@
 #. module: base
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro ! VocÃª nÃ£o pode criar membros recursivos associados."
 
 #. module: base
 #: help:res.lang,code:0
@@ -6974,7 +7021,7 @@
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Painel do Gerente de RH"
 
 #. module: base
 #: code:addons/base/module/module.py:253
@@ -6982,6 +7029,8 @@
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"O mÃ³dulo \"%s\" nÃ£o pode ser instalado porque uma dependÃªncia externa nÃ£o "
+"foi encontrada: %s"
 
 #. module: base
 #: view:ir.module.module:0
@@ -7011,6 +7060,10 @@
 "not connect to the system. You can assign them groups in order to give them "
 "specific access to the applications they need to use in the system."
 msgstr ""
+"Crie e gerencie os usuÃ¡rios que irÃ£o conectar no sistema. UsuÃ¡rios podem ser "
+"desativados se nÃ£o puderem/devessem se conectar no sistema por um perÃodo de "
+"tempo. VocÃª pode atribuir grupos para permitir acesso especÃfico a "
+"aplicaÃ§Ãµes que eles precisam usar no sistema."
 
 #. module: base
 #: selection:res.request,priority:0
@@ -7026,13 +7079,13 @@
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_update
 msgid "Module Update"
-msgstr ""
+msgstr "AtualizaÃ§Ã£o de MÃ³dulo"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Following modules are not installed or unknown: %s"
-msgstr ""
+msgstr "Os seguintes mÃ³dulos nÃ£o estÃ£o instalados ou sÃ£o desconhecidos: %s"
 
 #. module: base
 #: view:ir.cron:0
@@ -7061,7 +7114,7 @@
 #. module: base
 #: field:ir.actions.act_window,auto_search:0
 msgid "Auto Search"
-msgstr ""
+msgstr "Persquisa AutomÃ¡tica"
 
 #. module: base
 #: field:ir.actions.act_window,filter:0
@@ -7071,7 +7124,7 @@
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
 msgid "Ms."
-msgstr ""
+msgstr "Sra."
 
 #. module: base
 #: model:res.country,name:base.ch
@@ -7101,7 +7154,7 @@
 #. module: base
 #: view:base.language.install:0
 msgid "Load"
-msgstr ""
+msgstr "Carregar"
 
 #. module: base
 #: help:res.config.users,name:0
@@ -7114,18 +7167,18 @@
 #: code:addons/osv.py:156
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Erro de Integridade"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_wizard_screen
 msgid "ir.wizard.screen"
-msgstr ""
+msgstr "ir.wizard.screen"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:223
 #, python-format
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Tamanho de campo nunca pode ser menor que 1!"
 
 #. module: base
 #: model:res.country,name:base.so
@@ -7135,7 +7188,7 @@
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Terminated"
-msgstr ""
+msgstr "Terminado"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -7145,7 +7198,7 @@
 #. module: base
 #: view:res.lang:0
 msgid "Update Terms"
-msgstr ""
+msgstr "Atualizar Termos"
 
 #. module: base
 #: field:partner.sms.send,mobile_to:0
@@ -7164,7 +7217,7 @@
 #: code:addons/orm.py:716
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "ID do Banco de Dados nÃ£o existe: %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -7180,18 +7233,18 @@
 #: code:addons/orm.py:836
 #, python-format
 msgid "key '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "chave '%s' nÃ£o encontrado no campo de seleÃ§Ã£o '%s'"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Correct EAN13"
-msgstr ""
+msgstr "EAN13 Correto"
 
 #. module: base
 #: code:addons/orm.py:2317
 #, python-format
 msgid "The value \"%s\" for the field \"%s\" is not in the selection"
-msgstr ""
+msgstr "O valor \"%s\" para o campo \"%s\" nÃ£o estÃ¡ na seleÃ§Ã£o"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -7204,7 +7257,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (NI) / EspaÃ±ol (NI)"
-msgstr ""
+msgstr "Spanish (NI) / EspaÃ±ol (NI)"
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
@@ -7225,7 +7278,7 @@
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Execution Date"
-msgstr ""
+msgstr "PrÃ³xima Data de ExecuÃ§Ã£o"
 
 #. module: base
 #: help:multi_company.default,field_id:0
@@ -7267,7 +7320,7 @@
 #. module: base
 #: model:ir.ui.menu,name:base.menu_mrp_root
 msgid "Manufacturing"
-msgstr ""
+msgstr "Manufatura"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -7289,7 +7342,7 @@
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr ""
+msgstr "OpÃ§Ãµes de SeleÃ§Ã£o"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
@@ -7312,6 +7365,8 @@
 msgid ""
 "Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
 msgstr ""
+"O(s) grupo(s) nÃ£o pode(m) ser excluÃdo(s) porque algum usuÃ¡rio pertence a "
+"ele(s): %s!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
@@ -7366,6 +7421,9 @@
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[objeto com referÃªncia: %s - %s]"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_default
@@ -7395,6 +7453,8 @@
 "Number of time the function is called,\n"
 "a negative number indicates no limit"
 msgstr ""
+"NÃºmero de vezes que a funÃ§Ã£o Ã© chamada,\n"
+"um nÃºmero negativo indica que nÃ£o hÃ¡ limite"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:331
@@ -7403,6 +7463,8 @@
 "Changing the type of a column is not yet supported. Please drop it and "
 "create it again!"
 msgstr ""
+"A alteraÃ§Ã£o do tipo de uma coluna nÃ£o Ã© suportada ainda. Por favor, remova e "
+"crie a coluna novamente!"
 
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
@@ -7418,7 +7480,7 @@
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
 msgid "Google Maps"
-msgstr ""
+msgstr "Google Maps"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -7434,7 +7496,7 @@
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract_wizard
 msgid "publisher_warranty.contract.wizard"
-msgstr ""
+msgstr "publisher_warranty.contract.wizard"
 
 #. module: base
 #: field:ir.actions.server,expression:0
@@ -7507,7 +7569,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Galician / Galego"
-msgstr ""
+msgstr "Galician / Galego"
 
 #. module: base
 #: model:res.country,name:base.no
@@ -7528,7 +7590,7 @@
 #. module: base
 #: view:res.currency:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_10
@@ -7548,7 +7610,7 @@
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report file"
-msgstr ""
+msgstr "Arquivo de relatÃ³rio"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_triggers
@@ -7559,7 +7621,7 @@
 #: code:addons/base/ir/ir_model.py:62
 #, python-format
 msgid "Invalid search criterions"
-msgstr ""
+msgstr "CritÃ©rio de pesquisa invÃ¡lido"
 
 #. module: base
 #: view:ir.attachment:0
@@ -7619,13 +7681,15 @@
 "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
 msgstr ""
+"VocÃª estÃ¡ tentando instalar o mÃ³dulo '%s' que depende do mÃ³dulo '%s'.\n"
+"Mas este Ãºltimo nÃ£o estÃ¡ disponÃvel no seu sistema."
 
 #. module: base
 #: view:base.language.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_import_language
 #: model:ir.ui.menu,name:base.menu_view_base_import_language
 msgid "Import Translation"
-msgstr ""
+msgstr "Importar TraduÃ§Ã£o"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
@@ -7643,7 +7707,7 @@
 #: selection:ir.attachment,type:0
 #: selection:ir.property,type:0
 msgid "Binary"
-msgstr ""
+msgstr "BinÃ¡rio"
 
 #. module: base
 #: field:ir.actions.server,sms:0
@@ -7659,7 +7723,7 @@
 #. module: base
 #: view:workflow.activity:0
 msgid "Conditions"
-msgstr ""
+msgstr "CondiÃ§Ãµes"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
@@ -7676,7 +7740,7 @@
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "O nome do grupo deve ser Ãºnico!"
 
 #. module: base
 #: view:ir.sequence:0
@@ -7691,7 +7755,7 @@
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
 msgid "Add a widget for User"
-msgstr ""
+msgstr "Adiciona um widget para o UsuÃ¡rio"
 
 #. module: base
 #: model:res.country,name:base.dk
@@ -7712,7 +7776,7 @@
 #: code:addons/orm.py:278
 #, python-format
 msgid "Unknown attribute %s in %s "
-msgstr ""
+msgstr "O atributo %s Ã© desconhecido em %s "
 
 #. module: base
 #: view:res.lang:0
@@ -7723,12 +7787,12 @@
 #: code:addons/fields.py:106
 #, python-format
 msgid "undefined get method !"
-msgstr ""
+msgstr "MÃ©todo get nÃ£o definido!"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Norwegian BokmÃ¥l / Norsk bokmÃ¥l"
-msgstr ""
+msgstr "Norwegian BokmÃ¥l / Norsk bokmÃ¥l"
 
 #. module: base
 #: help:res.config.users,new_password:0
@@ -7737,6 +7801,8 @@
 "Only specify a value if you want to change the user password. This user will "
 "have to logout and login again!"
 msgstr ""
+"Especifique um conteÃºdo apenas se vocÃª quiser trocar a senha do usuÃ¡rio. "
+"Este usuÃ¡rio precisarÃ¡ sair e entrar novamente!"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -7751,18 +7817,18 @@
 #. module: base
 #: model:ir.ui.menu,name:base.dashboard
 msgid "Dashboards"
-msgstr ""
+msgstr "PainÃ©is"
 
 #. module: base
 #: help:ir.attachment,type:0
 msgid "Binary File or external URL"
-msgstr ""
+msgstr "Arquivo BinÃ¡rio ou URL externa"
 
 #. module: base
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Alterar senha"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -7787,7 +7853,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
-msgstr ""
+msgstr "Occitan (FR, post 1500) / Occitan"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -7797,12 +7863,17 @@
 "button \"Schedule for Installation\" from the form view, then click on "
 "\"Apply Scheduled Upgrades\" to migrate your system."
 msgstr ""
+"VocÃª pode instalar novos mÃ³dulos para ativar novas funcionalidades, novos "
+"menus, relatÃ³rios ou dados na sua instÃ¢ncia do OpenERP. Para instalar algum "
+"mÃ³dulo, clique na opÃ§Ã£o \"Agendar para InstalaÃ§Ã£o\" na visualizaÃ§Ã£o em "
+"formulÃ¡rio, entÃ£o clique em \"Aplicar AtualizaÃ§Ãµes Agendadas\" para executar "
+"a instalaÃ§Ã£o."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_emails
 #: model:ir.ui.menu,name:base.menu_mail_gateway
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -7812,7 +7883,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Malayalam / à´®à´²à´¯à´¾à´³à´‚"
-msgstr ""
+msgstr "Malayalam / à´®à´²à´¯à´¾à´³à´‚"
 
 #. module: base
 #: view:res.request:0
@@ -7870,7 +7941,7 @@
 #. module: base
 #: field:base.language.install,overwrite:0
 msgid "Overwrite Existing Terms"
-msgstr ""
+msgstr "Sobrescrever Termos Existentes"
 
 #. module: base
 #: help:ir.actions.server,code:0
@@ -7880,7 +7951,7 @@
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "O cÃ³digo do paÃs deve ser Ãºnico!"
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
@@ -7901,7 +7972,7 @@
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
-msgstr ""
+msgstr "Atualizar MÃ³dulo"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -7932,6 +8003,9 @@
 "defining a list of (key, label) pairs. For example: "
 "[('blue','Blue'),('yellow','Yellow')]"
 msgstr ""
+"Lista de opÃ§Ãµes para um campo de seleÃ§Ã£o, especificada em expressÃ£o Python "
+"definindo uma lista de pares no formato (chave, descriÃ§Ã£o). Por exemplo: "
+"[('azul','Azul'),('amarelo','Amarelo')]"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -7944,6 +8018,8 @@
 "Indicates whether this object model lives in memory only, i.e. is not "
 "persisted (osv.osv_memory)"
 msgstr ""
+"Indica se este modelo de objeto reside apenas na memÃ³ria, ou seja, nÃ£o Ã© "
+"persistido (osv.osv_memory)"
 
 #. module: base
 #: field:res.partner,child_ids:0
@@ -7961,7 +8037,7 @@
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register"
-msgstr ""
+msgstr "Registrar"
 
 #. module: base
 #: field:res.request,ref_doc2:0
@@ -8022,6 +8098,9 @@
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
+"Este assistente ajuda vocÃª a adicionar um novo idioma ao sistema OpenERP. "
+"ApÃ³s carregar o novo idioma, ele se torna disponÃvel como idioma padrÃ£o da "
+"interface para usuÃ¡rios e parceiros."
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -8044,7 +8123,7 @@
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_consumers0
 msgid "Consumers"
-msgstr ""
+msgstr "Consumidores"
 
 #. module: base
 #: view:res.config:0
@@ -8058,6 +8137,7 @@
 "Name of the method to be called on the object when this scheduler is "
 "executed."
 msgstr ""
+"Nome do mÃ©todo a ser chamado no objeto quando este agendamento for executado."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:219
@@ -8066,11 +8146,13 @@
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
 msgstr ""
+"A expressÃ£o de OpÃ§Ãµes de SeleÃ§Ã£o deve estar no formato "
+"[('chave','DescriÃ§Ã£o'),...]!"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: base
 #: model:res.country,name:base.cn
@@ -8101,6 +8183,8 @@
 "Create and manage the companies that will be managed by OpenERP from here. "
 "Shops or subsidiaries can be created and maintained from here."
 msgstr ""
+"Crie e gerencie as empresas que vocÃª quer controlar com o OpenERP aqui. "
+"Lojas ou subsidiÃ¡rias podem ser criadas e gerenciadas aqui tambÃ©m."
 
 #. module: base
 #: model:res.country,name:base.id
@@ -8133,7 +8217,7 @@
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr ""
+msgstr "O contrato de garantia do distribuidor foi registrado com sucesso!"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -8168,7 +8252,7 @@
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_ltd
 msgid "ltd"
-msgstr ""
+msgstr "ltda"
 
 #. module: base
 #: field:ir.values,res_id:0
@@ -8189,7 +8273,7 @@
 #. module: base
 #: view:base.module.update:0
 msgid "Click on Update below to start the process..."
-msgstr ""
+msgstr "Clique no Atualizar abaixo para iniciar o processo..."
 
 #. module: base
 #: model:res.country,name:base.ir
@@ -8200,12 +8284,12 @@
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
 msgid "Widgets per User"
-msgstr ""
+msgstr "Widgets por UsuÃ¡rio"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Slovak / SlovenskÃ½ jazyk"
-msgstr ""
+msgstr "Slovak / SlovenskÃ½ jazyk"
 
 #. module: base
 #: field:base.language.export,state:0
@@ -8217,18 +8301,18 @@
 #. module: base
 #: field:res.currency,symbol:0
 msgid "Symbol"
-msgstr ""
+msgstr "SÃmbolo"
 
 #. module: base
 #: help:res.config.users,login:0
 #: help:res.users,login:0
 msgid "Used to log into the system"
-msgstr ""
+msgstr "Usado para entrar no sistema"
 
 #. module: base
 #: view:base.update.translations:0
 msgid "Synchronize Translation"
-msgstr ""
+msgstr "Sincronizar TraduÃ§Ã£o"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -8248,7 +8332,7 @@
 #. module: base
 #: model:ir.ui.menu,name:base.menu_association
 msgid "Association"
-msgstr ""
+msgstr "AssociaÃ§Ã£o"
 
 #. module: base
 #: model:res.country,name:base.cl
@@ -8281,7 +8365,7 @@
 #: code:addons/base/res/res_lang.py:157
 #, python-format
 msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+msgstr "O idioma base 'en_US' nÃ£o pode ser excluÃdo!"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -8320,6 +8404,8 @@
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: %s, Document type: %s)."
 msgstr ""
+"OperaÃ§Ã£o proibida por regras de acesso ou executada em um documento jÃ¡ "
+"excluÃdo (OperaÃ§Ã£o: %s, Tipo de documento: %s)."
 
 #. module: base
 #: model:res.country,name:base.zr
@@ -8343,12 +8429,12 @@
 #. module: base
 #: view:res.widget.user:0
 msgid "User Widgets"
-msgstr ""
+msgstr "Widgets de UsuÃ¡rio"
 
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
-msgstr ""
+msgstr "Atualizar Lista de MÃ³dulos"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -8383,6 +8469,7 @@
 #, python-format
 msgid "The osv_memory field can only be compared with = and != operator."
 msgstr ""
+"O campo osv_memory pode ser comparado com os operadores = e != apenas."
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -8392,24 +8479,24 @@
 #. module: base
 #: help:multi_company.default,name:0
 msgid "Name it to easily find a record"
-msgstr ""
+msgstr "Coloque um nome para encontrar facilmente um registro"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Menu Items"
-msgstr ""
+msgstr "Ãtens de Menu"
 
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Regras nÃ£o sÃ£o suportadas em objetos osv_memory!"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_association
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organisation"
-msgstr ""
+msgstr "OrganizaÃ§Ã£o de Eventos"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -8511,12 +8598,12 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Danish / Dansk"
-msgstr ""
+msgstr "Danish / Dansk"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "Pesquisa AvanÃ§ada (obsoleta)"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -8544,7 +8631,7 @@
 #. module: base
 #: view:ir.ui.view:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Info. Extra"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
@@ -8560,7 +8647,7 @@
 #. module: base
 #: model:ir.model,name:base.model_partner_wizard_ean_check
 msgid "Ean Check"
-msgstr ""
+msgstr "ConferÃªncia de EAN"
 
 #. module: base
 #: sql_constraint:res.config.users:0
@@ -8582,7 +8669,7 @@
 #: field:res.config.users,menu_tips:0
 #: field:res.users,menu_tips:0
 msgid "Menu Tips"
-msgstr ""
+msgstr "Dicas de Menu"
 
 #. module: base
 #: field:ir.translation,src:0
@@ -8623,14 +8710,14 @@
 #. module: base
 #: view:base.language.export:0
 msgid "_Export"
-msgstr ""
+msgstr "_Exportar"
 
 #. module: base
 #: field:base.language.install,state:0
 #: field:base.module.import,state:0
 #: field:base.module.update,state:0
 msgid "state"
-msgstr ""
+msgstr "status"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8645,7 +8732,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Cyrillic) / ÑÑ€Ð¿ÑÐºÐ¸"
-msgstr ""
+msgstr "Serbian (Cyrillic) / ÑÑ€Ð¿ÑÐºÐ¸"
 
 #. module: base
 #: code:addons/orm.py:2161
@@ -8654,6 +8741,8 @@
 "Invalid group_by specification: \"%s\".\n"
 "A group_by specification must be a list of valid fields."
 msgstr ""
+"EspecificaÃ§Ã£o de group_by invÃ¡lida: \"%s\".\n"
+"Uma definiÃ§Ã£o de group_by precisa ser uma lista de campos vÃ¡lidos."
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -8683,7 +8772,7 @@
 #: code:addons/base/module/wizard/base_module_configuration.py:37
 #, python-format
 msgid "System Configuration done"
-msgstr ""
+msgstr "ConfiguraÃ§Ã£o do Sistema pronta"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -8738,7 +8827,7 @@
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr ""
+msgstr "Registrar um Contrato"
 
 #. module: base
 #: view:ir.rule:0
@@ -8754,6 +8843,8 @@
 #, python-format
 msgid "Please check your publisher warranty contract name and validity."
 msgstr ""
+"Por favor, confira o nome do seu contrato de garantia do distribuidor e a "
+"validade."
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -8798,7 +8889,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Romanian / romÃ¢nÄƒ"
-msgstr ""
+msgstr "Romanian / romÃ¢nÄƒ"
 
 #. module: base
 #: view:res.log:0
@@ -8836,7 +8927,7 @@
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply For Create"
-msgstr ""
+msgstr "Aplicar Para CriaÃ§Ã£o"
 
 #. module: base
 #: model:res.country,name:base.vi
@@ -8862,6 +8953,11 @@
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
+"Gerencie e personalize os itens disponÃveis e mostrados no menu do seu "
+"sistema OpenERP. VocÃª pode excluir um item clicando no box que fica no "
+"inÃcio de cada linha e depois clicar no botÃ£o que aparece. Itens podem ser "
+"atribuÃdos a grupos especÃficos para que fiquem disponÃveis apenas para "
+"alguns usuÃ¡rios do sistema."
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
@@ -8902,7 +8998,7 @@
 #: code:addons/base/ir/ir_model.py:232
 #, python-format
 msgid "You cannot remove the field '%s' !"
-msgstr ""
+msgstr "VocÃª nÃ£o pode remover o campo '%s'!"
 
 #. module: base
 #: field:ir.exports,resource:0
@@ -8914,23 +9010,23 @@
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "Arquivo do Ãcone Web"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Persian / ÙØ§Ø±Ø³"
-msgstr ""
+msgstr "Persian / ÙØ§Ø±Ø³"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "View Ordering"
-msgstr ""
+msgstr "OrdenaÃ§Ã£o da ExibiÃ§Ã£o"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Unmet dependency !"
-msgstr ""
+msgstr "DependÃªncia nÃ£o atendida!"
 
 #. module: base
 #: view:base.language.import:0
@@ -8938,6 +9034,8 @@
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
 msgstr ""
+"Formatos de arquivo suportado: *.csv (Separado por VÃrgula) ou *.po (GetText "
+"Portable Objects)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:487
@@ -8946,11 +9044,13 @@
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"VocÃª nÃ£o pode excluir este documento (%s)! Certifique-se de que seu usuÃ¡rio "
+"pertence a um destes grupos: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
 msgid "base.module.configuration"
-msgstr ""
+msgstr "base.module.configuration"
 
 #. module: base
 #: field:base.language.export,name:0
@@ -8972,7 +9072,7 @@
 #. module: base
 #: model:ir.ui.menu,name:base.publisher_warranty
 msgid "Publisher Warranty"
-msgstr ""
+msgstr "Garantia do Distribuidor"
 
 #. module: base
 #: model:res.country,name:base.aw
@@ -9024,17 +9124,17 @@
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr ""
+msgstr "Contrato de Garantia do Distribuidor"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bulgarian / Ð±ÑŠÐ»Ð³Ð°Ñ€ÑÐºÐ¸ ÐµÐ·Ð¸Ðº"
-msgstr ""
+msgstr "Bulgarian / Ð±ÑŠÐ»Ð³Ð°Ñ€ÑÐºÐ¸ ÐµÐ·Ð¸Ðº"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "ServiÃ§os pÃ³s-venda"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -9166,6 +9266,9 @@
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Se vocÃª estiver usando o OpenERP pela primeira vez, recomendamos que "
+"selecione a interface simplificada, que tem menos opÃ§Ãµes mas Ã© mais fÃ¡cil. "
+"VocÃª poderÃ¡ sempre mudar isso nas preferÃªncias de usuÃ¡rio."
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -9207,7 +9310,7 @@
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "Setor de TI"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -9222,7 +9325,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (SV) / EspaÃ±ol (SV)"
-msgstr ""
+msgstr "Spanish (SV) / EspaÃ±ol (SV)"
 
 #. module: base
 #: help:res.lang,grouping:0
@@ -9247,7 +9350,7 @@
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Renomeie uma coluna de cada vez!"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9257,7 +9360,7 @@
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Report/Template"
-msgstr ""
+msgstr "RelatÃ³rio/Modelo"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -9301,7 +9404,7 @@
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr ""
+msgstr "Repare que esta operaÃ§Ã£o pode durar alguns minutos."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
@@ -9316,7 +9419,7 @@
 #. module: base
 #: view:ir.cron:0
 msgid "Execution"
-msgstr ""
+msgstr "ExecuÃ§Ã£o"
 
 #. module: base
 #: field:ir.actions.server,condition:0
@@ -9350,11 +9453,13 @@
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"Apenas uma aÃ§Ã£o de cliente serÃ¡ executada. A Ãºltima aÃ§Ã£o de cliente serÃ¡ "
+"considerada em caso de mÃºltiplas aÃ§Ãµes de cliente."
 
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
-msgstr ""
+msgstr "%j - Dia do ano [001-366]."
 
 #. module: base
 #: field:ir.actions.server,mobile:0
@@ -9373,7 +9478,7 @@
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System Update"
-msgstr ""
+msgstr "AtualizaÃ§Ã£o do Sistema"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -9383,7 +9488,7 @@
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "Prefixo de registro para a sequÃªncia"
 
 #. module: base
 #: model:res.country,name:base.sc
@@ -9421,12 +9526,12 @@
 #: code:addons/base/res/res_user.py:256
 #, python-format
 msgid "Company Switch Warning"
-msgstr ""
+msgstr "Aviso de MudanÃ§a de Empresa"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr ""
+msgstr "Homepage para Gerenciamento de Widgets"
 
 #. module: base
 #: field:workflow,osv:0
@@ -9437,7 +9542,7 @@
 #. module: base
 #: help:ir.sequence,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr ""
+msgstr "O prÃ³ximo nÃºmero da sequÃªncia serÃ¡ incrementada com este nÃºmero"
 
 #. module: base
 #: field:ir.cron,function:0
@@ -9449,7 +9554,7 @@
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr ""
+msgstr "Pesquisar Widget"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0

=== modified file 'openerp/addons/base/i18n/vi.po'
--- openerp/addons/base/i18n/vi.po	2011-02-03 23:00:23 +0000
+++ openerp/addons/base/i18n/vi.po	2011-02-28 11:47:53 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-01-11 08:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-27 01:05+0000\n"
+"Last-Translator: phi_binh <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Vietnamese <vi@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-01-12 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-28 05:53+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base
 #: view:ir.filters:0
@@ -381,7 +391,7 @@
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bosnian / bosanski jezik"
-msgstr ""
+msgstr "Tiáº¿ng Bosnia"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0

=== modified file 'openerp/addons/base/ir/ir_rule.py'
--- openerp/addons/base/ir/ir_rule.py	2010-12-10 22:42:58 +0000
+++ openerp/addons/base/ir/ir_rule.py	2011-02-28 11:47:53 +0000
@@ -34,9 +34,12 @@
     def _domain_force_get(self, cr, uid, ids, field_name, arg, context={}):
         res = {}
         for rule in self.browse(cr, uid, ids, context):
-            eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
-                              'time':time}
-            res[rule.id] = eval(rule.domain_force, eval_user_data)
+            if rule.domain_force:
+                eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
+                                  'time':time}
+                res[rule.id] = eval(rule.domain_force, eval_user_data)
+            else:
+                res[rule.id] = []
         return res
 
     def _get_value(self, cr, uid, ids, field_name, arg, context={}):
@@ -81,10 +84,15 @@
     ]
 
     def domain_create(self, cr, uid, rule_ids):
-        dom = ['&'] * (len(rule_ids)-1)
+        count = 0
+        dom = []
         for rule in self.browse(cr, uid, rule_ids):
-            dom += rule.domain
-        return dom
+            if rule.domain:
+                dom += rule.domain
+                count += 1
+        if count:
+            return ['&'] * (count-1) + dom
+        return []
 
     @tools.cache()
     def _compute_domain(self, cr, uid, model_name, mode="read"):
@@ -110,11 +118,18 @@
                     group_rule.setdefault(group.id, []).append(rule.id)
                 if not rule.groups:
                   global_rules.append(rule.id)
-            dom = self.domain_create(cr, uid, global_rules)
-            dom += ['|'] * (len(group_rule)-1)
+            global_domain = self.domain_create(cr, uid, global_rules)
+            count = 0
+            group_domains = []
             for value in group_rule.values():
-                dom += self.domain_create(cr, uid, value)
-            return dom
+                group_domain = self.domain_create(cr, uid, value)
+                if group_domain:
+                    group_domains += group_domain
+                    count += 1
+            if count and global_domain:
+                return ['&'] + global_domain + ['|'] * (count-1) + group_domains
+            if count:
+                return ['|'] * (count-1) + group_domains
         return []
 
     def clear_cache(self, cr, uid):