From 346d19862ab407c7aaf71cac405a62e288969e51 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 2 Oct 2011 00:34:02 +0200 Subject: [PATCH] [IMP] mail server view bzr revid: fp@tinyerp.com-20111001223402-zh4bmgmihliiic1c --- openerp/addons/base/ir/ir_mail_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 96fa9f52a88..e8d97160068 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -145,14 +145,14 @@ class ir_mail_server(osv.osv): _columns = { 'name': fields.char('Description', size=64, required=True, select=True), - 'smtp_host': fields.char('Server Name', size=128, required=True, help="Hostname or IP of SMTP server"), + 'smtp_host': fields.char('SMTP Server', size=128, required=True, help="Hostname or IP of SMTP server"), 'smtp_port': fields.integer('SMTP Port', size=5, required=True, help="SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."), 'smtp_user': fields.char('Username', size=64, help="Optional username for SMTP authentication"), 'smtp_pass': fields.char('Password', size=64, help="Optional password for SMTP authentication"), 'smtp_encryption': fields.selection([('none','None'), ('starttls','TLS (STARTTLS)'), ('ssl','SSL/TLS')], - string='Connection Security', + string='Connection Security', required=True, help="Choose the connection encryption scheme:\n" "- None: SMTP sessions are done in cleartext.\n" "- TLS (STARTTLS): TLS encryption is requested at start of SMTP session (Recommended)\n"