diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-06 11:12:19 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-06 11:12:19 +0530 |
| commit | 2cc02f84d245871402dabfdba67dee62bdb30fa2 (patch) | |
| tree | b39f15bc7b70e89347768b3ebacf3f7e27a23984 /addons/fetchmail | |
| parent | c494b78f7776f64bde8d4cdefa82f7cdda867548 (diff) | |
| parent | 1da7ac2448a5e29bb43994286d3fbb8d90576d54 (diff) | |
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-message-sub-type-apa
bzr revid: sgo@tinyerp.com-20120806054219-yxe9cwx4yguz7t55
Diffstat (limited to 'addons/fetchmail')
| -rw-r--r-- | addons/fetchmail/__init__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 3 | ||||
| -rw-r--r-- | addons/fetchmail/i18n/pt_BR.po | 4 |
4 files changed, 5 insertions, 6 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 35b692990d7..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 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 7eb7095729b..6b74bfa4910 100644 --- a/addons/fetchmail/i18n/pt_BR.po +++ b/addons/fetchmail/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" -"X-Generator: Launchpad (build 15694)\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 |