summaryrefslogtreecommitdiff
path: root/addons/fetchmail
diff options
context:
space:
mode:
authorBharat (OpenERP) <bde@tinyerp.com>2011-09-15 17:02:01 +0530
committerBharat (OpenERP) <bde@tinyerp.com>2011-09-15 17:02:01 +0530
commitd72be842e320dfff08b7ad4b443740060dfd5a4e (patch)
treefd8315220318e2abd672b4270a18a763c8564e9d /addons/fetchmail
parent1e767f0d14dfb0870767524bf16c9909bcaee995 (diff)
parentfbf6708d1041f84018bb9c13e997b705e6086648 (diff)
[MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg
Diffstat (limited to 'addons/fetchmail')
-rw-r--r--addons/fetchmail/__openerp__.py39
-rw-r--r--addons/fetchmail/fetchmail.py260
-rw-r--r--addons/fetchmail/fetchmail_data.xml8
-rw-r--r--addons/fetchmail/fetchmail_installer_view.xml4
-rw-r--r--addons/fetchmail/fetchmail_view.xml142
-rw-r--r--addons/fetchmail/i18n/bg.po8
-rw-r--r--addons/fetchmail/i18n/ca.po8
-rw-r--r--addons/fetchmail/i18n/de.po47
-rw-r--r--addons/fetchmail/i18n/el.po4
-rw-r--r--addons/fetchmail/i18n/en_GB.po321
-rw-r--r--addons/fetchmail/i18n/es.po35
-rw-r--r--addons/fetchmail/i18n/fi.po4
-rw-r--r--addons/fetchmail/i18n/fr.po9
-rw-r--r--addons/fetchmail/i18n/gl.po5
-rw-r--r--addons/fetchmail/i18n/hu.po8
-rw-r--r--addons/fetchmail/i18n/it.po46
-rw-r--r--addons/fetchmail/i18n/lt.po5
-rw-r--r--addons/fetchmail/i18n/lv.po5
-rw-r--r--addons/fetchmail/i18n/mn.po34
-rw-r--r--addons/fetchmail/i18n/nl.po43
-rw-r--r--addons/fetchmail/i18n/pl.po35
-rw-r--r--addons/fetchmail/i18n/pt.po8
-rw-r--r--addons/fetchmail/i18n/pt_BR.po5
-rw-r--r--addons/fetchmail/i18n/ro.po5
-rw-r--r--addons/fetchmail/i18n/ru.po83
-rw-r--r--addons/fetchmail/i18n/sr.po34
-rw-r--r--addons/fetchmail/i18n/sr@latin.po34
-rw-r--r--addons/fetchmail/i18n/sv.po19
-rw-r--r--addons/fetchmail/i18n/tr.po8
-rw-r--r--addons/fetchmail/i18n/vi.po10
-rw-r--r--addons/fetchmail/i18n/zh_CN.po49
-rw-r--r--addons/fetchmail/security/ir.model.access.csv3
32 files changed, 696 insertions, 632 deletions
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index d2694fdb958..986c3bc12a1 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,19 +21,42 @@
##############################################################################
{
- "name" : "Fetchmail Server",
+ "name" : "Automated Email Retriever",
"version" : "1.0",
- "depends" : ["base", 'mail_gateway'],
+ "depends" : ["base", 'mail'],
"author" : "OpenERP SA",
"category": 'Tools',
"description": """
-Fetch email from POP / IMAP servers.
-====================================
+Retrieve incoming email on POP / IMAP servers
+=============================================
- * Supports SSL
- * Integrated with all modules
- * Automatically receive email
- * Email-based record operations (Add, Update)
+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:
+
+ * CRM Leads/Opportunities
+ * CRM Claims
+ * Project Issues
+ * Project Tasks
+ * Human Resource Recruitments (Applicants)
+ * etc.
+
+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.
+
+For more specific needs, you may also assign custom-defined actions
+(technically: Server Actions) to be triggered for each incoming
+mail.
""",
'website': 'http://www.openerp.com',
'init_xml': [],
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 9817f0d6633..b7460965c3b 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -19,8 +19,8 @@
#
##############################################################################
+import logging
import time
-
from imaplib import IMAP4
from imaplib import IMAP4_SSL
from poplib import POP3
@@ -29,222 +29,200 @@ from poplib import POP3_SSL
import netsvc
from osv import osv, fields
import tools
+from tools.translate import _
-logger = netsvc.Logger()
-
+logger = logging.getLogger('fetchmail')
-class email_server(osv.osv):
-
- _name = 'email.server'
+class fetchmail_server(osv.osv):
+ """Incoming POP/IMAP mail server account"""
+ _name = 'fetchmail.server'
_description = "POP/IMAP Server"
+ _order = 'priority'
_columns = {
'name':fields.char('Name', size=256, required=True, readonly=False),
'active':fields.boolean('Active', required=False),
'state':fields.selection([
('draft', 'Not Confirmed'),
- ('waiting', 'Waiting for Verification'),
('done', 'Confirmed'),
], 'State', select=True, readonly=True),
- 'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'server' : fields.char('Server Name', size=256, required=True, readonly=True, help="Hostname or IP of the mail server", states={'draft':[('readonly', False)]}),
'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly', False)]}),
'type':fields.selection([
('pop', 'POP Server'),
('imap', 'IMAP Server'),
- ], 'Server Type', select=True, readonly=False),
- 'is_ssl':fields.boolean('SSL ?', required=False),
- 'attach':fields.boolean('Add Attachments ?', required=False, help="Fetches mail with attachments if true."),
- 'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
- 'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
- 'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ ], 'Server Type', select=True, required=True, readonly=False),
+ 'is_ssl':fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP3S=995)"),
+ 'attach':fields.boolean('Keep Attachments', help="Whether attachments should be downloaded. "
+ "If not enabled, incoming emails will be stripped of any attachments before being processed"),
+ 'original':fields.boolean('Keep Original', help="Whether a full original copy of each email should be kept for reference"
+ "and attached to each processed message. This will usually double the size of your message database."),
+ 'date': fields.datetime('Last Fetch Date', readonly=True),
+ 'user' : fields.char('Username', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'password' : fields.char('Password', size=1024, required=True, readonly=True, states={'draft':[('readonly', False)]}),
'note': fields.text('Description'),
- 'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
- 'object_id': fields.many2one('ir.model', "Object To Create", required=True, help="Whenever an email arrives, it automatically creates the object of this type with all the information attached."),
- 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
- 'user_id':fields.many2one('res.users', 'User', required=False, help="This is the user that runs the cron"),
- 'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True),
+ 'action_id':fields.many2one('ir.actions.server', 'Server Action', help="Optional custom server action to trigger for each incoming mail, "
+ "on the record that was created or updated by this mail"),
+ 'object_id': fields.many2one('ir.model', "Target document type", required=True, help="Process each incoming mail as part of a conversation "
+ "corresponding to this document type. This will create "
+ "new documents for new conversations, or attach follow-up "
+ "emails to the existing conversations (documents)."),
+ 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, "
+ "lower values mean higher priority"),
+ 'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True),
}
_defaults = {
- 'state': lambda *a: "draft",
- 'active': lambda *a: True,
- 'priority': lambda *a: 5,
- 'date': lambda *a: time.strftime('%Y-%m-%d'),
- 'user_id': lambda self, cr, uid, ctx: uid,
+ 'state': "draft",
+ 'active': True,
+ 'priority': 5,
+ 'attach': True,
}
- def check_duplicate(self, cr, uid, ids, context=None):
- # RFC *-* Why this limitation? why not in SQL constraint?
- vals = self.read(cr, uid, ids, ['user', 'password'], context=context)[0]
- cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password']))
- res = cr.fetchone()
- if res:
- if res[0] > 1:
- return False
- return True
-
- def check_model(self, cr, uid, ids, context = None):
- if context is None:
- context = {}
- current_rec = self.read(cr, uid, ids, context)
- if current_rec:
- current_rec = current_rec[0]
- model_name = self.pool.get('ir.model').browse(cr, uid, current_rec.get('object_id')[0]).model
- model = self.pool.get(model_name)
- if hasattr(model, 'message_new'):
- return True
- return False
-
- _constraints = [
- (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password']),
- (check_model, 'Warning! Record for selected Model can not be created\nPlease choose valid Model', ['object_id'])
- ]
-
def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
port = 0
if server_type == 'pop':
port = ssl and 995 or 110
elif server_type == 'imap':
port = ssl and 993 or 143
-
return {'value':{'port':port}}
def set_draft(self, cr, uid, ids, context=None):
self.write(cr, uid, ids , {'state':'draft'})
return True
-
+
+ def connect(self, cr, uid, server_id, context=None):
+ if isinstance(server_id, (list,tuple)):
+ server_id = server_id[0]
+ server = self.browse(cr, uid, server_id, context)
+ if server.type == 'imap':
+ if server.is_ssl:
+ connection = IMAP4_SSL(server.server, int(server.port))
+ else:
+ connection = IMAP4(server.server, int(server.port))
+ connection.login(server.user, server.password)
+ elif server.type == 'pop':
+ if server.is_ssl:
+ connection = POP3_SSL(server.server, int(server.port))
+ else:
+ connection = POP3(server.server, int(server.port))
+ #TODO: use this to remove only unread messages
+ #connection.user("recent:"+server.user)
+ connection.user(server.user)
+ connection.pass_(server.password)
+ return connection
+
def button_confirm_login(self, cr, uid, ids, context=None):
if context is None:
context = {}
for server in self.browse(cr, uid, ids, context=context):
- logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
- context.update({'server_id': server.id, 'server_type': server.type})
try:
- if server.type == 'imap':
- imap_server = None
- if server.is_ssl:
- imap_server = IMAP4_SSL(server.server, int(server.port))
- else:
- imap_server = IMAP4(server.server, int(server.port))
-
- imap_server.login(server.user, server.password)
- ret_server = imap_server
-
- elif server.type == 'pop':
- pop_server = None
- if server.is_ssl:
- pop_server = POP3_SSL(server.server, int(server.port))
- else:
- pop_server = POP3(server.server, int(server.port))
-
- #TODO: use this to remove only unread messages
- #pop_server.user("recent:"+server.user)
- pop_server.user(server.user)
- pop_server.pass_(server.password)
- ret_server = pop_server
-
- self.write(cr, uid, [server.id], {'state':'done'})
- if context.get('get_server',False):
- return ret_server
+ connection = server.connect()
+ server.write({'state':'done'})
except Exception, e:
- logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e))
- return True
-
- def button_fetch_mail(self, cr, uid, ids, context=None):
- self.fetch_mail(cr, uid, ids, context=context)
+ logger.exception("Failed to connect to %s server %s", server.type, server.name)
+ raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
+ finally:
+ try:
+ if connection:
+ if server.type == 'imap':
+ connection.close()
+ elif server.type == 'pop':
+ connection.quit()
+ except Exception:
+ # ignored, just a consequence of the previous exception
+ pass
return True
def _fetch_mails(self, cr, uid, ids=False, context=None):
if not ids:
- ids = self.search(cr, uid, [])
+ ids = self.search(cr, uid, [('state','=','done')])
return self.fetch_mail(cr, uid, ids, context=context)
def fetch_mail(self, cr, uid, ids, context=None):
+ """WARNING: meant for cron usage only - will commit() after each email!"""
if context is None:
context = {}
- email_tool = self.pool.get('email.server.tools')
+ mail_thread = self.pool.get('mail.thread')
action_pool = self.pool.get('ir.actions.server')
- context.update({'get_server': True})
for server in self.browse(cr, uid, ids, context=context):
+ logger.info('start checking for new emails on %s server %s', server.type, server.name)
+ context.update({'fetchmail_server_id': server.id, 'server_type': server.type})
count = 0
- user = server.user_id.id or uid
- try:
- if server.type == 'imap':
- imap_server = self.button_confirm_login(cr, uid, [server.id], context=context)
+ if server.type == 'imap':
+ try:
+ imap_server = server.connect()
imap_server.select()
result, data = imap_server.search(None, '(UNSEEN)')
for num in data[0].split():
result, data = imap_server.fetch(num, '(RFC822)')
- res_id = email_tool.process_email(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context)
+ res_id = mail_thread.message_process(cr, uid, server.object_id.model, data[0][1],
+ save_original=server.original,
+ strip_attachments=(not server.attach),
+ context=context)
if res_id and server.action_id:
- action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
-
+ action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
imap_server.store(num, '+FLAGS', '\\Seen')
+ cr.commit()
count += 1
- logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name))
-
- imap_server.close()
- imap_server.logout()
- elif server.type == 'pop':
- pop_server = self.button_confirm_login(cr, uid, [server.id], context=context)
- pop_server.list()
+ logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name)
+ except Exception, e:
+ logger.exception("Failed to fetch mail from %s server %s", server.type, server.name)
+ finally:
+ if imap_server:
+ imap_server.close()
+ imap_server.logout()
+ elif server.type == 'pop':
+ try:
+ pop_server = server.connect()
(numMsgs, totalSize) = pop_server.stat()
+ pop_server.list()
for num in range(1, numMsgs + 1):
(header, msges, octets) = pop_server.retr(num)
msg = '\n'.join(msges)
- res_id = email_tool.process_email(cr, user, server.object_id.model, msg, attach=server.attach, context=context)
+ res_id = mail_thread.message_process(cr, uid, server.object_id.model,
+ msg,
+ save_original=server.original,
+ strip_attachments=(not server.attach),
+ context=context)
if res_id and server.action_id:
- action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
-
+ action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
pop_server.dele(num)
-
- pop_server.quit()
-
- logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
-
- except Exception, e:
- logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))
-
+ cr.commit()
+ logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name)
+ except Exception, e:
+ logger.exception("Failed to fetch mail from %s server %s", server.type, server.name)
+ finally:
+ if pop_server:
+ pop_server.quit()
+ server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)})
return True
-email_server()
-
-class mailgate_message(osv.osv):
-
- _inherit = "mailgate.message"
-
+class mail_message(osv.osv):
+ _inherit = "mail.message"
_columns = {
- 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
- 'server_type':fields.selection([
- ('pop', 'POP Server'),
- ('imap', 'IMAP Server'),
- ], 'Server Type', select=True, readonly=True),
+ 'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server",
+ readonly=True,
+ select=True,
+ oldname='server_id'),
}
- _order = 'id desc'
def create(self, cr, uid, values, context=None):
if context is None:
context={}
- server_id = context.get('server_id',False)
- server_type = context.get('server_type',False)
- if server_id:
- values['server_id'] = server_id
- if server_type:
- values['server_type'] = server_type
- res = super(mailgate_message,self).create(cr, uid, values, context=context)
+ fetchmail_server_id = context.get('fetchmail_server_id')
+ if fetchmail_server_id:
+ values['fetchmail_server_id'] = fetchmail_server_id
+ res = super(mail_message,self).create(cr, uid, values, context=context)
return res
def write(self, cr, uid, ids, values, context=None):
if context is None:
context={}
- server_id = context.get('server_id',False)
- server_type = context.get('server_type',False)
- if server_id:
- values['server_id'] = server_id
- if server_type:
- values['server_type'] = server_type
- res = super(mailgate_message,self).write(cr, uid, ids, values, context=context)
+ fetchmail_server_id = context.get('fetchmail_server_id')
+ if fetchmail_server_id:
+ values['fetchmail_server_id'] = server_id
+ res = super(mail_message,self).write(cr, uid, ids, values, context=context)
return res
-mailgate_message()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml
index ef40a76489f..d77aadc12de 100644
--- a/addons/fetchmail/fetchmail_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -6,10 +6,10 @@
<field name="interval_number">5</field>
<field name="interval_type">minutes</field>
<field name="numbercall">-1</field>
- <field eval="False" name="doall"/>
- <field eval="'email.server'" name="model"/>
- <field eval="'_fetch_mails'" name="function"/>
- <field eval="'()'" name="args"/>
+ <field name="doall" eval="False"/>
+ <field name="model">fetchmail.server</field>
+ <field name="function">_fetch_mails</field>
+ <field name="args">()</field>
</record>
</data>
</openerp>
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index 34cfc686a8d..911ad8101da 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -1,9 +1,9 @@
<openerp>
<data>
<record model="ir.actions.act_window" id="view_email_server_form_installer">
- <field name="name">Setup Your Mail server</field>
+ <field name="name">Setup Incoming Mail Server (fetchmail)</field>
<field name="type">ir.actions.act_window</field>
- <field name="res_model">email.server</field>
+ <field name="res_model">fetchmail.server</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="fetchmail.view_email_server_form"/>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 99f421ac4a5..05f62f4b9fb 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -1,44 +1,42 @@
<?xml version="1.0"?>
<openerp>
<data>
-
+
<record model="ir.ui.view" id="view_email_server_tree">
- <field name="name">email.server.tree</field>
- <field name="model">email.server</field>
+ <field name="name">fetchmail.server.list</field>
+ <field name="model">fetchmail.server</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state in ('draft');black:state in ('waiting');gray:state in('done')" string="POP/IMAP Servers">
+ <tree colors="blue:state == 'draft'" string="POP/IMAP Servers">
<field name="name"/>
<field name="type"/>
- <field name="user"/>
<field name="is_ssl"/>
<field name="object_id"/>
+ <field name="date"/>
<field name="message_ids" string="# of emails"/>
<field name="state"/>
</tree>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_email_server_form">
- <field name="name">email.server.form</field>
- <field name="model">email.server</field>
+ <field name="name">fetchmail.server.form</field>
+ <field name="model">fetchmail.server</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="POP/IMAP Server">
+ <form string="Incoming Mail Server">
<group col="6" colspan="4">
<field name="name" select="1" colspan="4"/>
<field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
<field name="date" select="1"/>
- <field name="attach"/>
- <field name="active" select="1"/>
</group>
<notebook colspan="4">
<page string="Server &amp; Login">
- <group col="2" colspan="2">
+ <group col="4" colspan="2">
<separator string="Server Information" colspan="2"/>
- <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
- <field name="server" />
+ <field name="server" colspan="4"/>
<field name="port" />
+ <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
</group>
<group col="2" colspan="2">
<separator string="Login Information" colspan="2"/>
@@ -46,35 +44,39 @@
<field name="password" password="True" />
</group>
<group col="2" colspan="2">
- <separator string="Auto Reply?" colspan="2"/>
- <field name="action_id"/>
- <field name="user_id"/>
- </group>
- <group col="2" colspan="2">
- <separator string="Process Parameter" colspan="2"/>
+ <separator string="Automated Processing" colspan="2"/>
<field name="object_id"/>
- <field name="priority"/>
+ <field name="action_id"/>
</group>
<separator string="Description" colspan="4"/>
<field name="note" colspan="4" nolabel="1"/>
</page>
+ <page string="Advanced">
+ <group colspan="2" col="2">
+ <separator string="Advanced options" colspan="2"/>
+ <field name="priority"/>
+ <field name="attach"/>
+ <field name="original"/>
+ <field name="active" select="1"/>
+ </group>
+ </page>
</notebook>
<group col="6" colspan="4">
<field name="state" select="1"/>
- <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
- <button string="Fetch Emails" type="object" name="button_fetch_mail" states="done"/>
- <button string="Set to Draft" type="object" name="set_draft" icon="gtk-convert"/>
+ <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
+ <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
+ <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
</group>
</form>
</field>
</record>
-
+
<record model="ir.ui.view" id="view_email_server_search">
- <field name="name">email.server.search</field>
- <field name="model">email.server</field>
+ <field name="name">fetchmail.server.search</field>
+ <field name="model">fetchmail.server</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Search Email Servers">
+ <search string="Search Incoming Mail Servers">
<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"/>
@@ -91,68 +93,52 @@
</search>
</field>
</record>
-
+
<record model="ir.actions.act_window" id="action_email_server_tree">
- <field name="name">Email Servers</field>
- <field name="res_model">email.server</field>
+ <field name="name">Incoming Mail Servers</field>
+ <field name="res_model">fetchmail.server</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_email_server_tree"/>
<field name="search_view_id" ref="view_email_server_search"/>
</record>
- <menuitem
- parent="base.menu_mail_gateway"
+ <menuitem
+ parent="base.next_id_15"
id="menu_action_fetchmail_server_tree"
- action="action_email_server_tree"
- name="Email Servers"
+ action="action_email_server_tree"
+ name="Incoming Mail Servers"
+ sequence="40"
/>
-
- <record model="ir.ui.view" id="mailgate_message_tree_view">
- <field name="name">mailgate.message.tree</field>
- <field name="model">mailgate.message</field>
- <field name="type">tree</field>
- <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
- <field name="arch" type="xml">
- <field name="user_id" position="after">
- <field name="server_id" select="1"/>
- <field name="ref_id"/>
- </field>
- </field>
+
+ <record model="ir.ui.view" id="email_message_tree_view">
+ <field name="name">mail.message.list.fetchmail</field>
+ <field name="model">mail.message</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="mail.view_email_message_tree"/>
+ <field name="arch" type="xml">
+ <field name="user_id" position="after">
+ <field name="fetchmail_server_id" select="1"/>
+ </field>
+ </field>
</record>
-
- <record model="ir.ui.view" id="mailgate_message_search_view">
- <field name="name">mailgate.message.inherit.search</field>
- <field name="model">mailgate.message</field>
- <field name="type">search</field>
- <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/>
- <field name="arch" type="xml">
- <xpath expr="/search/field[@name='name']" position="before">
- <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
- <separator orientation="vertical"/>
- </xpath>
- <xpath expr="/search/group/filter[@string='Thread']" position="before">
- <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
+
+ <record model="ir.ui.view" id="email_message_search_view">
+ <field name="name">mail.message.inherit.search</field>
+ <field name="model">mail.message</field>
+ <field name="type">search</field>
+ <field name="inherit_id" ref="mail.view_email_message_search"/>
+ <field name="arch" type="xml">
+ <xpath expr="/search/group/filter[@string='Thread']" position="before">
+ <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/>
</xpath>
- </field>
+ </field>
</record>
-
- <record id="action_view_mail_message_emails" model="ir.actions.act_window">
- <field name="name">Messages</field>
- <field name="res_model">mailgate.message</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="context">{'search_default_emails': 1}</field>
- <field name="search_view_id" ref="mailgate_message_search_view"/>
- </record>
-
- <menuitem id="base.menu_email_gateway_form"
- parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
- <act_window
- context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
- id="act_server_history" name="Emails"
- res_model="mailgate.message" src_model="email.server"/>
-
+ <act_window
+ context="{'search_default_server_id': active_id, 'default_server_id': active_id}"
+ id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
+ res_model="mail.message" src_model="fetchmail.server"/>
+
</data>
</openerp>
diff --git a/addons/fetchmail/i18n/bg.po b/addons/fetchmail/i18n/bg.po
index c074f30c4c0..09b288aac6a 100644
--- a/addons/fetchmail/i18n/bg.po
+++ b/addons/fetchmail/i18n/bg.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
msgstr "Парола"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Имейли"
@@ -304,3 +305,6 @@ msgstr "Пощенски сървър"
#: view:email.server:0
msgid "Fetch Emails"
msgstr ""
+
+#~ msgid "Email Servers"
+#~ msgstr "Имейл сървъри"
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
index 8a3c92f990e..aa65d52c0f1 100644
--- a/addons/fetchmail/i18n/ca.po
+++ b/addons/fetchmail/i18n/ca.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
msgstr "Contrasenya"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Emails"
@@ -315,3 +316,6 @@ msgstr "Servidor de correu"
#: view:email.server:0
msgid "Fetch Emails"
msgstr "Recupera emails"
+
+#~ msgid "Email Servers"
+#~ msgstr "Servidores de correo"
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index cc44a3fc4e6..9af5be0407c 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
msgstr "Passwort"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Email Konfiguration"
@@ -316,47 +317,5 @@ msgstr "Mail Server"
msgid "Fetch Emails"
msgstr "Abholen Emails"
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "haben !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehler in Modellbezeichnung der definierten Aktion"
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Server"
-
-#~ msgid "Reply Email"
-#~ msgstr "Antwort EMail"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Fehlerhafte Argumente"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für Ansicht"
-
-#~ msgid "Received Email History"
-#~ msgstr "Historie empfangene EMails"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regeln werden für osv_memory Objekt nicht unterstützt"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "OpenObject Model. Generates a record of this model."
-#~ msgstr "OpenObject Modell. Erstellt einen Datensatz von diesem Modell."
-
#~ msgid "Email Servers"
#~ msgstr "EMail Server"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po
index 402020e4f8c..71cc8770ae4 100644
--- a/addons/fetchmail/i18n/el.po
+++ b/addons/fetchmail/i18n/el.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: 2011-08-24 04:37+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
diff --git a/addons/fetchmail/i18n/en_GB.po b/addons/fetchmail/i18n/en_GB.po
new file mode 100644
index 00000000000..d785f63b396
--- /dev/null
+++ b/addons/fetchmail/i18n/en_GB.po
@@ -0,0 +1,321 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-13 09:02+0000\n"
+"Last-Translator: John Bradshaw <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2011-09-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Confirmed"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Confirm"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Group By..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "State"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Not Confirmed"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "User Name"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Type"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP Servers"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Fetchmail Server"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Description"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Add Attachments ?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "# of emails"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Email History"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "User"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Date"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Waiting for Verification"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Password"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "Emails"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Search Email Servers"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Auto Reply?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mail gateway Message"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "POP Servers"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Set to Draft"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Messages"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Fetchmail Services"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Server"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Active"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Process Parameter"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "IMAP Server"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "Warning! Can't have duplicate server configuration!"
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Server Type"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Login Information"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Server Information"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr "Fetches mail with attachments if true."
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "POP Server"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+" * Fetch email from Pop / IMAP server\n"
+" * Support SSL\n"
+" * Integrated with all Modules\n"
+" * Automatic Email Receive\n"
+" * Email based Records (Add, Update)\n"
+" "
+msgstr ""
+"Fetchmail: \n"
+" * Fetch email from Pop / IMAP server\n"
+" * Support SSL\n"
+" * Integrated with all Modules\n"
+" * Automatic Email Receive\n"
+" * Email based Records (Add, Update)\n"
+" "
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Priority between 0 to 10, select define the order of Processing"
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr "Email Server Action"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Server Priority"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Mail Server"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Fetch Emails"
+
+#~ msgid "Email Servers"
+#~ msgstr "Email Servers"
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index ba0f6f2147d..12fc571185d 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -129,6 +129,7 @@ msgid "Password"
msgstr "Contraseña"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Emails"
@@ -317,35 +318,5 @@ msgstr "Servidor correo"
msgid "Fetch Emails"
msgstr "Recuperar emails"
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "¡Error! No puede crear menús recursivos."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "Servidores IMAP"
-
-#~ msgid "Reply Email"
-#~ msgstr "Email respuesta"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argumentos no válidos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "Received Email History"
-#~ msgstr "Historial emails recibidos"
-
#~ msgid "Email Servers"
#~ msgstr "Servidores de correo"
-
-#~ msgid "OpenObject Model. Generates a record of this model."
-#~ msgstr "Modelo OpenObject. Genera un registro de este modelo."
diff --git a/addons/fetchmail/i18n/fi.po b/addons/fetchmail/i18n/fi.po
index 16c2f9c9132..2a3f80957aa 100644
--- a/addons/fetchmail/i18n/fi.po
+++ b/addons/fetchmail/i18n/fi.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: 2011-08-05 04:40+0000\n"
-"X-Generator: Launchpad (build 13604)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 003d75df81f..7de418d0fb1 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
msgstr "Mot de passe"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Courriels"
@@ -317,5 +318,5 @@ msgstr "Serveur de courriel"
msgid "Fetch Emails"
msgstr "Récupérer les courriels"
-#~ msgid "IMAP Servers"
-#~ msgstr "Serveur IMAP"
+#~ msgid "Email Servers"
+#~ msgstr "Serveurs de courriels"
diff --git a/addons/fetchmail/i18n/gl.po b/addons/fetchmail/i18n/gl.po
index 14b8cdc8c02..9ead422e467 100644
--- a/addons/fetchmail/i18n/gl.po
+++ b/addons/fetchmail/i18n/gl.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
msgstr "Contrasinal"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Correos electrónicos"
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 2f76bca54be..8c63e7220a6 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2011-01-19 14:10+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -125,6 +126,7 @@ msgid "Password"
msgstr "Jelszó"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "E-mailek"
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index a27539dd3ac..345c134b951 100644
--- a/addons/fetchmail/i18n/it.po
+++ b/addons/fetchmail/i18n/it.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
msgstr "Password"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Email"
@@ -153,7 +154,7 @@ msgstr "Nome"
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_mailgate_message
msgid "Mailgateway Message"
-msgstr ""
+msgstr "Messaggio server mail"
#. module: fetchmail
#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -174,7 +175,7 @@ msgstr "Messaggi"
#. module: fetchmail
#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
msgid "Fetchmail Services"
-msgstr ""
+msgstr "Serizio recupero posta"
#. module: fetchmail
#: field:email.server,server:0
@@ -296,7 +297,7 @@ msgstr ""
#. module: fetchmail
#: field:email.server,action_id:0
msgid "Email Server Action"
-msgstr ""
+msgstr "Azione server email"
#. module: fetchmail
#: field:email.server,priority:0
@@ -312,40 +313,7 @@ msgstr "Mail Server"
#. module: fetchmail
#: view:email.server:0
msgid "Fetch Emails"
-msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valido nella definizione dell'azione."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "IMAP Servers"
-#~ msgstr "Server IMAP"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Argomenti non validi"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
-
-#~ msgid "Reply Email"
-#~ msgstr "Rispondi Email"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
+msgstr "Preleva email"
#~ msgid "Email Servers"
#~ msgstr "Server Email"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/fetchmail/i18n/lt.po b/addons/fetchmail/i18n/lt.po
index 32f7e1c714c..3c6461ce9c1 100644
--- a/addons/fetchmail/i18n/lt.po
+++ b/addons/fetchmail/i18n/lt.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
msgstr "Slaptažodis"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "El. laiškai"
diff --git a/addons/fetchmail/i18n/lv.po b/addons/fetchmail/i18n/lv.po
index 4cebb9d50c2..8700e4b85f2 100644
--- a/addons/fetchmail/i18n/lv.po
+++ b/addons/fetchmail/i18n/lv.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Parole"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "E-pasti"
diff --git a/addons/fetchmail/i18n/mn.po b/addons/fetchmail/i18n/mn.po
index 79a2d4a62b1..b1a8d42bbae 100644
--- a/addons/fetchmail/i18n/mn.po
+++ b/addons/fetchmail/i18n/mn.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Password"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr ""
@@ -309,32 +310,3 @@ msgstr "Мэйл сервер"
#: view:email.server:0
msgid "Fetch Emails"
msgstr "Fetch Emails"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "The Object name must start with x_ and not contain any special character !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Invalid model name in the action definition."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Servers"
-
-#~ msgid "Reply Email"
-#~ msgstr "Reply Email"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Error ! You can not create recursive Menu."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Invalid arguments"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalid XML for View Architecture!"
-
-#~ msgid "Received Email History"
-#~ msgstr "Received Email History"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules are not supported for osv_memory objects !"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index 2195e992c08..07a2a38620f 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
msgstr "Wachtwoord"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "E-mails"
@@ -316,43 +317,5 @@ msgstr "Mail server"
msgid "Fetch Emails"
msgstr "Ophalen emails"
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief Menu maken."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Servers"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Ongeldige argumenten"
-
-#~ msgid "Received Email History"
-#~ msgstr "Ontvangen Email Historie"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie-definiëring."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De Objectnaam moet starten met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Reply Email"
-#~ msgstr "Mail beantwoorden"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid "OpenObject Model. Generates a record of this model."
-#~ msgstr "OpenObject model. Genereert een record van dit model."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
#~ msgid "Email Servers"
#~ msgstr "Email servers"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index ce09e9505db..f1c33301a4d 100644
--- a/addons/fetchmail/i18n/pl.po
+++ b/addons/fetchmail/i18n/pl.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Hasło"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr ""
@@ -309,33 +310,3 @@ msgstr "Serwer pocztowy"
#: view:email.server:0
msgid "Fetch Emails"
msgstr "Pobierz pocztę"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Nieprawidłowe parametry"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Received Email History"
-#~ msgstr "Historia otrzymanych wiadomości"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Reguły nie sa obsługiwane w obiektach osv_memory !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "Serwery IMAP"
-
-#~ msgid "Reply Email"
-#~ msgstr "Odpowiedź na email"
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 1e631d0dffa..079c25ae95b 100644
--- a/addons/fetchmail/i18n/pt.po
+++ b/addons/fetchmail/i18n/pt.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -126,6 +126,7 @@ msgid "Password"
msgstr "Senha"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Mensagens"
@@ -309,6 +310,3 @@ msgstr "Retira emails."
#~ msgid "Email Servers"
#~ msgstr "Servidores de correio"
-
-#~ msgid "Reply Email"
-#~ msgstr "Responder à mensagem"
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index be3830d96f1..dae03eb1665 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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Senha"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Emails"
diff --git a/addons/fetchmail/i18n/ro.po b/addons/fetchmail/i18n/ro.po
index 7b57fc2a210..969814dea3d 100644
--- a/addons/fetchmail/i18n/ro.po
+++ b/addons/fetchmail/i18n/ro.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Parolă"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Email-uri"
diff --git a/addons/fetchmail/i18n/ru.po b/addons/fetchmail/i18n/ru.po
index 01f4d4abfd4..82b9a7c65d2 100644
--- a/addons/fetchmail/i18n/ru.po
+++ b/addons/fetchmail/i18n/ru.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -23,6 +23,8 @@ msgid ""
"Warning! Record for selected Model can not be created\n"
"Please choose valid Model"
msgstr ""
+"Внимание! Невозможно создать запись для выбранной модели\n"
+"Выберите верную модель"
#. module: fetchmail
#: selection:email.server,state:0
@@ -53,7 +55,7 @@ msgstr "POP"
#. module: fetchmail
#: selection:email.server,state:0
msgid "Not Confirmed"
-msgstr ""
+msgstr "Не подтверждено"
#. module: fetchmail
#: field:email.server,user:0
@@ -68,12 +70,12 @@ msgstr "Тип"
#. module: fetchmail
#: view:email.server:0
msgid "POP/IMAP Servers"
-msgstr ""
+msgstr "Сервера POP/IMAP"
#. module: fetchmail
#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
msgid "Fetchmail Server"
-msgstr ""
+msgstr "Сервер Fetchmail"
#. module: fetchmail
#: view:email.server:0
@@ -87,6 +89,8 @@ msgid ""
"OpenObject Model. Generates a record of this model.\n"
"Select Object with message_new attrbutes."
msgstr ""
+"Модель OpenObject. По этой модели генерируется запись.\n"
+"Выбрать объект с атрибутами message_new."
#. module: fetchmail
#: field:email.server,attach:0
@@ -96,7 +100,7 @@ msgstr "Добавить вложение?"
#. module: fetchmail
#: view:email.server:0
msgid "# of emails"
-msgstr ""
+msgstr "Кол-во писем"
#. module: fetchmail
#: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -116,7 +120,7 @@ msgstr "Дата"
#. module: fetchmail
#: selection:email.server,state:0
msgid "Waiting for Verification"
-msgstr ""
+msgstr "Ожидание проверки"
#. module: fetchmail
#: field:email.server,password:0
@@ -124,6 +128,7 @@ msgid "Password"
msgstr "Пароль"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "Письма"
@@ -131,17 +136,17 @@ msgstr "Письма"
#. module: fetchmail
#: view:email.server:0
msgid "Search Email Servers"
-msgstr ""
+msgstr "Поиск серверов электронной почты"
#. module: fetchmail
#: view:email.server:0
msgid "Server & Login"
-msgstr ""
+msgstr "Сервер и имя пользователя"
#. module: fetchmail
#: view:email.server:0
msgid "Auto Reply?"
-msgstr ""
+msgstr "Авто-ответ?"
#. module: fetchmail
#: field:email.server,name:0
@@ -151,7 +156,7 @@ msgstr "Название"
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_mailgate_message
msgid "Mailgateway Message"
-msgstr ""
+msgstr "Соообщение почтового шлюза"
#. module: fetchmail
#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -192,7 +197,7 @@ msgstr "Параметр процесса"
#. module: fetchmail
#: field:email.server,is_ssl:0
msgid "SSL ?"
-msgstr ""
+msgstr "SSL?"
#. module: fetchmail
#: selection:email.server,type:0
@@ -214,12 +219,12 @@ msgstr "IMAP"
#: view:email.server:0
#: model:ir.model,name:fetchmail.model_email_server
msgid "POP/IMAP Server"
-msgstr ""
+msgstr "Сервер POP/IMAP"
#. module: fetchmail
#: constraint:email.server:0
msgid "Warning! Can't have duplicate server configuration!"
-msgstr ""
+msgstr "Внимание! Нельзя использовать повторяющиеся конфигурации сервера!"
#. module: fetchmail
#: field:email.server,type:0
@@ -240,13 +245,13 @@ msgstr "Сведения о сервере"
#. module: fetchmail
#: help:email.server,attach:0
msgid "Fetches mail with attachments if true."
-msgstr ""
+msgstr "Если в значении \"Истина\", получать письма с вложениями."
#. module: fetchmail
#: selection:email.server,type:0
#: selection:mailgate.message,server_type:0
msgid "POP Server"
-msgstr ""
+msgstr "Сервер POP"
#. module: fetchmail
#: field:email.server,port:0
@@ -264,11 +269,18 @@ msgid ""
" * Email based Records (Add, Update)\n"
" "
msgstr ""
+"Fetchmail: \n"
+" * Получение почты с серверов POP/IMAP\n"
+" * Поддержка SSL\n"
+" * Интеграция со всеми модулями\n"
+" * Автоматическое получение почты\n"
+" * Записи на основе писем (Добавление, Обновление)\n"
+" "
#. module: fetchmail
#: view:email.server:0
msgid "SSL"
-msgstr ""
+msgstr "SSL"
#. module: fetchmail
#: help:email.server,action_id:0
@@ -276,53 +288,34 @@ msgid ""
"An Email Server Action. It will be run whenever an e-mail is fetched from "
"server."
msgstr ""
+"Действие для почтового сервера. Будет выполняться при получении каждого "
+"письма с сервера."
#. module: fetchmail
#: help:email.server,priority:0
msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr ""
+msgstr "Приоритет от 0 до 10, выбор определяет порядок обработки."
#. module: fetchmail
#: field:email.server,action_id:0
msgid "Email Server Action"
-msgstr ""
+msgstr "Действие для почтового сервера"
#. module: fetchmail
#: field:email.server,priority:0
msgid "Server Priority"
-msgstr ""
+msgstr "Приоритет сервера"
#. module: fetchmail
#: view:mailgate.message:0
#: field:mailgate.message,server_id:0
msgid "Mail Server"
-msgstr ""
+msgstr "Почтовый сервер"
#. module: fetchmail
#: view:email.server:0
msgid "Fetch Emails"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Недопустимые аргументы"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Некорректный формат XML для структуры вида!"
+msgstr "Получить эл. почту"
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Название модуля должно быть уникальным!"
+#~ msgid "Email Servers"
+#~ msgstr "Сервера электронной почты"
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
index 4e2f3b35c04..03e072e626e 100644
--- a/addons/fetchmail/i18n/sr.po
+++ b/addons/fetchmail/i18n/sr.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Lozinka"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr ""
@@ -309,32 +310,3 @@ msgstr "Email Server"
#: view:email.server:0
msgid "Fetch Emails"
msgstr "Hvata Emailove"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Serveri"
-
-#~ msgid "Reply Email"
-#~ msgstr "Odgovori na Email"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Received Email History"
-#~ msgstr "Istorija Primljenih E-mailova"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index d7458a00f36..e4bc911b34c 100644
--- a/addons/fetchmail/i18n/sr@latin.po
+++ b/addons/fetchmail/i18n/sr@latin.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Lozinka"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr ""
@@ -309,32 +310,3 @@ msgstr "Email Server"
#: view:email.server:0
msgid "Fetch Emails"
msgstr "Hvata Emailove"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Serveri"
-
-#~ msgid "Reply Email"
-#~ msgstr "Odgovori na Email"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Received Email History"
-#~ msgstr "Istorija Primljenih E-mailova"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index 97109fa1f38..8597c6eba03 100644
--- a/addons/fetchmail/i18n/sv.po
+++ b/addons/fetchmail/i18n/sv.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
msgstr "Lösenord"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr ""
@@ -302,17 +303,3 @@ msgstr ""
#: view:email.server:0
msgid "Fetch Emails"
msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fel! Ni kan inte skapa recursiva menyer"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/fetchmail/i18n/tr.po b/addons/fetchmail/i18n/tr.po
index f07574487a3..76e51084431 100644
--- a/addons/fetchmail/i18n/tr.po
+++ b/addons/fetchmail/i18n/tr.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -128,6 +128,7 @@ msgid "Password"
msgstr "Şifre"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "E-postalar"
@@ -316,3 +317,6 @@ msgstr "E-Posta Sunucusu"
#: view:email.server:0
msgid "Fetch Emails"
msgstr "E-postaları Çeker"
+
+#~ msgid "Email Servers"
+#~ msgstr "Eposta Sunucuları"
diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 4386cf40a1f..3025ae85045 100644
--- a/addons/fetchmail/i18n/vi.po
+++ b/addons/fetchmail/i18n/vi.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: 2011-07-21 04:35+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -303,9 +303,3 @@ msgstr ""
#: view:email.server:0
msgid "Fetch Emails"
msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Tên đối tượng phải được đặt bắt đầu với từ khóa x_ và không được bao gồm bất "
-#~ "kỳ ký tự đặc biệt nào."
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 9a2d5b5bc96..f169e8935fa 100644
--- a/addons/fetchmail/i18n/zh_CN.po
+++ b/addons/fetchmail/i18n/zh_CN.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: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: fetchmail
#: constraint:email.server:0
@@ -23,6 +23,8 @@ msgid ""
"Warning! Record for selected Model can not be created\n"
"Please choose valid Model"
msgstr ""
+"警告!选择模型不能创建。\n"
+"请选择有效的模板。"
#. module: fetchmail
#: selection:email.server,state:0
@@ -37,7 +39,7 @@ msgstr "确认"
#. module: fetchmail
#: view:email.server:0
msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
#. module: fetchmail
#: view:email.server:0
@@ -73,7 +75,7 @@ msgstr "POP/IMAP 服务器"
#. module: fetchmail
#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
msgid "Fetchmail Server"
-msgstr ""
+msgstr "Fetchmail服务器"
#. module: fetchmail
#: view:email.server:0
@@ -87,6 +89,8 @@ msgid ""
"OpenObject Model. Generates a record of this model.\n"
"Select Object with message_new attrbutes."
msgstr ""
+"OpenObject模型。这模型产生一个记录。\n"
+"选择对象与新属性消息。"
#. module: fetchmail
#: field:email.server,attach:0
@@ -96,7 +100,7 @@ msgstr "添加附件?"
#. module: fetchmail
#: view:email.server:0
msgid "# of emails"
-msgstr "封电子邮件"
+msgstr "# 电子邮件"
#. module: fetchmail
#: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -116,7 +120,7 @@ msgstr "日期"
#. module: fetchmail
#: selection:email.server,state:0
msgid "Waiting for Verification"
-msgstr ""
+msgstr "等待审批"
#. module: fetchmail
#: field:email.server,password:0
@@ -124,6 +128,7 @@ msgid "Password"
msgstr "密码"
#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr "电子邮件"
@@ -151,7 +156,7 @@ msgstr "名称"
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_mailgate_message
msgid "Mailgateway Message"
-msgstr "邮件网关信件"
+msgstr "邮件网关消息"
#. module: fetchmail
#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -167,7 +172,7 @@ msgstr "设为草稿"
#: field:email.server,message_ids:0
#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
msgid "Messages"
-msgstr "信件"
+msgstr "消息"
#. module: fetchmail
#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
@@ -182,7 +187,7 @@ msgstr "服务器"
#. module: fetchmail
#: field:email.server,active:0
msgid "Active"
-msgstr "有效"
+msgstr "生效"
#. module: fetchmail
#: view:email.server:0
@@ -219,7 +224,7 @@ msgstr "POP/IMAP 服务器"
#. module: fetchmail
#: constraint:email.server:0
msgid "Warning! Can't have duplicate server configuration!"
-msgstr "警告!不能创建重复的服务器配置!"
+msgstr "警告!不能创建设置重复的服务器!"
#. module: fetchmail
#: field:email.server,type:0
@@ -240,7 +245,7 @@ msgstr "服务器信息"
#. module: fetchmail
#: help:email.server,attach:0
msgid "Fetches mail with attachments if true."
-msgstr ""
+msgstr "如果为真取电子邮件与附件"
#. module: fetchmail
#: selection:email.server,type:0
@@ -264,6 +269,13 @@ msgid ""
" * Email based Records (Add, Update)\n"
" "
msgstr ""
+"Fetchmail(取电子邮件):\n"
+" 从Pop/IMAP服务器取电子邮件。\n"
+" 支持SSL\n"
+" 整合所有模块\n"
+" 自动接收邮件\n"
+" 邮件根据记录(新增/更新)\n"
+" "
#. module: fetchmail
#: view:email.server:0
@@ -275,30 +287,33 @@ msgstr "SSL"
msgid ""
"An Email Server Action. It will be run whenever an e-mail is fetched from "
"server."
-msgstr ""
+msgstr "电子邮件服务动作。它运行时从服务器取出电子邮件。"
#. module: fetchmail
#: help:email.server,priority:0
msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr ""
+msgstr "优先级从0到10,选择它的优先级"
#. module: fetchmail
#: field:email.server,action_id:0
msgid "Email Server Action"
-msgstr ""
+msgstr "电子邮件服务器动作"
#. module: fetchmail
#: field:email.server,priority:0
msgid "Server Priority"
-msgstr ""
+msgstr "服务器优先级"
#. module: fetchmail
#: view:mailgate.message:0
#: field:mailgate.message,server_id:0
msgid "Mail Server"
-msgstr ""
+msgstr "邮件服务器"
#. module: fetchmail
#: view:email.server:0
msgid "Fetch Emails"
-msgstr ""
+msgstr "取邮件"
+
+#~ msgid "Email Servers"
+#~ msgstr "电子邮件服务器"
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index 7aa6c84d22b..bc5572de82d 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,2 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_server","email.server","model_email_server",,1,1,1,1
+"access_fetchmail_server","fetchmail.server","model_fetchmail_server",,1,0,0,0
+"access_fetchmail_server","fetchmail.server","model_fetchmail_server","base.group_system",1,1,1,1