[MERGE] Merge with main branch

bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft

2 files changed, 22 insertions, 25 deletions

diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index d6d8cc74915..e871fd9b0c9 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/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:36+0000\n"
-"PO-Revision-Date: 2011-01-29 15:36+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-07-28 18:55+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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-07-14 06:14+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -26,7 +26,7 @@ msgstr "Dada de Criação"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
 msgid "Documents"
-msgstr ""
+msgstr "Documentos"
 
 #. module: document_webdav
 #: constraint:document.directory:0
@@ -45,17 +45,17 @@ msgstr "Procurar Propriedades dos Documentos"
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Namespace"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
 msgid "DAV properties"
-msgstr ""
+msgstr "Propriedades DAV"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "document.webdav.file.property"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -66,18 +66,18 @@ msgstr "Agrupar Por..."
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Estas propriedades serão adicionadas para requisições WebDAV"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_file_props_form
 msgid "DAV Properties for Documents"
-msgstr ""
+msgstr "Propriedades DAV para Documentos"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "Erro de Iimportação PyWEbDAV!"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
@@ -88,7 +88,7 @@ msgstr "Documento"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_folder_props
 msgid "Folders"
-msgstr ""
+msgstr "Pastas"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -103,7 +103,7 @@ msgstr "Contexo dinâmico"
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "Propriedades WebDAV"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -118,11 +118,14 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Por favor instale o PyWebDAV de "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
-msgstr ""
+msgstr "Propriedades DAV para as pastas"
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -140,7 +143,7 @@ msgstr "Nome"
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
 msgid "document.webdav.dir.property"
-msgstr ""
+msgstr "document.webdav.dir.property"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,value:0
@@ -180,12 +183,12 @@ msgstr "Criador"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
 msgid "DAV Properties"
-msgstr ""
+msgstr "Propriedades DAV"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "O diretório precisa ter um pai ou um armazenamento"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 44af9f2af3a..35c37530f4d 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -38,10 +38,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name"
-                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
-                    string="Document property"/>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document property"/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
                         <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>
@@ -140,10 +137,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name"
-                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
-                    string="Document Property"/>
-                    <newline/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document Property"/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>
                         <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>