[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120806061113-1ck1nrda2sdq06im

4 files changed, 74 insertions, 59 deletions

diff --git a/addons/fetchmail/__init__.py b/addons/fetchmail/__init__.py
index 7703c4d2f5b..7d666479965 100644
--- a/addons/fetchmail/__init__.py
+++ b/addons/fetchmail/__init__.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    mga@tinyerp.com
+#    mga@openerp.com
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index c16bfb217c9..1e8c57a9524 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    mga@tinyerp.com
+#    mga@openerp.com
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
@@ -27,36 +27,33 @@
     "author" : "OpenERP SA",
     "category": 'Tools',
     "description": """
-Retrieve incoming email on POP / IMAP servers
-=============================================
+Retrieve incoming email on POP/IMAP servers.
+============================================
 
-Enter the parameters of your POP/IMAP account(s), and any incoming
-emails on these accounts will be automatically downloaded into your OpenERP
-system. All POP3/IMAP-compatible servers are supported, included those
-that require an encrypted SSL/TLS connection.
+Enter the parameters of your POP/IMAP account(s), and any incoming emails on
+these accounts will be automatically downloaded into your OpenERP system. All
+POP3/IMAP-compatible servers are supported, included those that require an
+encrypted SSL/TLS connection.
 
-This can be used to easily create email-based workflows for many
-email-enabled OpenERP documents, such as:
+This can be used to easily create email-based workflows for many email-enabled
+OpenERP documents, such as:
 
- * CRM Leads/Opportunities
- * CRM Claims
- * Project Issues
- * Project Tasks
- * Human Resource Recruitments (Applicants)
- * etc.
+    * CRM Leads/Opportunities
+    * CRM Claims
+    * Project Issues
+    * Project Tasks
+    * Human Resource Recruitments (Applicants)
 
-Just install the relevant application, and you can assign any of
-these document types (Leads, Project Issues, etc.) to your incoming
-email accounts. New emails will automatically spawn new documents
-of the chosen type, so it's a snap to create a mailbox-to-OpenERP
-integration. Even better: these documents directly act as mini
-conversations synchronized by email. You can reply from within
-OpenERP, and the answers will automatically be collected when
-they come back, and attached to the same *conversation* document.
+Just install the relevant application, and you can assign any of these document
+types (Leads, Project Issues) to your incoming email accounts. New emails will
+automatically spawn new documents of the chosen type, so it's a snap to create a
+mailbox-to-OpenERP integration. Even better: these documents directly act as mini
+conversations synchronized by email. You can reply from within OpenERP, and the
+answers will automatically be collected when they come back, and attached to the
+same *conversation* document.
 
 For more specific needs, you may also assign custom-defined actions
-(technically: Server Actions) to be triggered for each incoming
-mail. 
+(technically: Server Actions) to be triggered for each incoming mail.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 9567f7746f3..3325ae38c0b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -80,10 +80,9 @@
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
                     <field name="name" string="Incoming Mail Server"/>
-                    <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
-                    <separator orientation="vertical"/>
+                    <separator/>
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
                 </search>
             </field>
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index b9e5fd0e7a1..6b74bfa4910 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/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-02-28 21:26+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 22:38+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:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 15702)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -25,17 +25,19 @@ msgstr "Confirmado"
 #. module: fetchmail
 #: field:fetchmail.server,server:0
 msgid "Server Name"
-msgstr ""
+msgstr "Nome do Servidor"
 
 #. module: fetchmail
 #: field:fetchmail.server,script:0
 msgid "Script"
-msgstr ""
+msgstr "Script"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
 msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
+"Define a ordem de processamento, valores mais baixos significam prioridade "
+"maior"
 
 #. module: fetchmail
 #: help:fetchmail.server,is_ssl:0
@@ -43,11 +45,13 @@ msgid ""
 "Connections are encrypted with SSL/TLS through a dedicated port (default: "
 "IMAPS=993, POP3S=995)"
 msgstr ""
+"Conexões são encriptadas com  SSL/TLS através de uma porta dedicada (padrão: "
+"IMAPS=993, POP3S=995)"
 
 #. module: fetchmail
 #: field:fetchmail.server,attach:0
 msgid "Keep Attachments"
-msgstr ""
+msgstr "Manter Anexos"
 
 #. module: fetchmail
 #: help:fetchmail.server,original:0
@@ -56,6 +60,9 @@ msgid ""
 "attached to each processed message. This will usually double the size of "
 "your message database."
 msgstr ""
+"Se uma cópia completa de cada email deve ser mantida para referência e "
+"anexada a cada mensagem processada, isto geralmente dobra o tamanho do "
+"espaço de mensagens"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -75,13 +82,13 @@ msgstr "POP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "Buscar Agora"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Incoming Mail Servers"
-msgstr ""
+msgstr "Servidores de Email de Entrada"
 
 #. module: fetchmail
 #: field:fetchmail.server,port:0
@@ -96,12 +103,12 @@ msgstr "Servidores POP/IMAP"
 #. module: fetchmail
 #: selection:fetchmail.server,type:0
 msgid "Local Server"
-msgstr ""
+msgstr "Servidor Local"
 
 #. module: fetchmail
 #: field:fetchmail.server,user:0
 msgid "Username"
-msgstr ""
+msgstr "Usuário"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -111,7 +118,7 @@ msgstr "Servidor POP/IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Reset Confirmation"
-msgstr ""
+msgstr "Resetar Confirmação"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -121,12 +128,12 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Mensagem de Email"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "Data da última verificação"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -134,6 +141,8 @@ msgid ""
 "Optional custom server action to trigger for each incoming mail, on the "
 "record that was created or updated by this mail"
 msgstr ""
+"Ação opcional para disparar a cada email que chegar, no registro que foi "
+"atualizado por este email"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -143,7 +152,7 @@ msgstr "# de emails"
 #. module: fetchmail
 #: field:fetchmail.server,original:0
 msgid "Keep Original"
-msgstr ""
+msgstr "Manter original"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
@@ -152,33 +161,35 @@ msgid ""
 "Here is what we got instead:\n"
 " %s"
 msgstr ""
+"Aqui está o que temos em vez disso:\n"
+" %s"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 #: field:fetchmail.server,configuration:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuração"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
-msgstr ""
+msgstr "Servidor de Email de Entrada"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Teste de conexão falhou!"
 
 #. module: fetchmail
 #: help:fetchmail.server,server:0
 msgid "Hostname or IP of the mail server"
-msgstr ""
+msgstr "Hostname ou IP do servidor de emails"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type IMAP."
-msgstr ""
+msgstr "Servidor tipo IMAP"
 
 #. module: fetchmail
 #: field:fetchmail.server,name:0
@@ -188,22 +199,22 @@ msgstr "Nome"
 #. module: fetchmail
 #: field:fetchmail.server,is_ssl:0
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Test & Confirm"
-msgstr ""
+msgstr "Testar & Confirmar"
 
 #. module: fetchmail
 #: field:fetchmail.server,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Ação de Servidor"
 
 #. module: fetchmail
 #: field:mail.message,fetchmail_server_id:0
 msgid "Inbound Mail Server"
-msgstr ""
+msgstr "Servidor de email de entrada"
 
 #. module: fetchmail
 #: field:fetchmail.server,message_ids:0
@@ -214,7 +225,7 @@ msgstr "Mensagens"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Search Incoming Mail Servers"
-msgstr ""
+msgstr "Buscar servidor de email de entrada"
 
 #. module: fetchmail
 #: field:fetchmail.server,active:0
@@ -227,11 +238,13 @@ msgid ""
 "Whether attachments should be downloaded. If not enabled, incoming emails "
 "will be stripped of any attachments before being processed"
 msgstr ""
+"Se os anexos devem ser baixados. Se não estiver habilitado, os servidores de "
+"email irão excluir qualquer anexo antes de processar"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Opções Avançadas"
 
 #. module: fetchmail
 #: selection:fetchmail.server,type:0
@@ -246,7 +259,7 @@ msgstr "IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type POP."
-msgstr ""
+msgstr "Servidor tipo POP"
 
 #. module: fetchmail
 #: field:fetchmail.server,password:0
@@ -256,7 +269,7 @@ msgstr "Senha"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Actions to Perform on Incoming Mails"
-msgstr ""
+msgstr "Ações a serem executadas nos emails recebidos"
 
 #. module: fetchmail
 #: field:fetchmail.server,type:0
@@ -276,12 +289,12 @@ msgstr "Informação do Servidor"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "If SSL required."
-msgstr ""
+msgstr "Se SSL obrigatório."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -295,11 +308,14 @@ msgid ""
 "document type. This will create new documents for new conversations, or "
 "attach follow-up emails to the existing conversations (documents)."
 msgstr ""
+"Processar cada servidor de entrada como parte de uma conversa correspondente "
+"a este tipo de email. Isto irá criar novos documentos para novas conversas, "
+"ou anexar os emails como parte da conversa (documentos)"
 
 #. module: fetchmail
 #: field:fetchmail.server,object_id:0
 msgid "Create a New Record"
-msgstr ""
+msgstr "Criar um Novo Registro"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -378,3 +394,6 @@ msgstr "Servidor de Email"
 
 #~ msgid "Fetch Emails"
 #~ msgstr "Baixar Emails"
+
+#~ msgid "Advanced options"
+#~ msgstr "Opções avançadas"