[MERGE]merge with trunk addons

bzr revid: sgo@tinyerp.com-20120808052023-i87gopbxesqwfm0q

34 files changed, 151 insertions, 115 deletions

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 55923c3043a..f0e6a5179b4 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -71,7 +71,7 @@ class fetchmail_server(osv.osv):
         'password' : fields.char('Password', size=1024, readonly=True, states={'draft':[('readonly', False)]}),
         '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', "Create a New Record", required=True, help="Process each incoming mail as part of a conversation "
+        'object_id': fields.many2one('ir.model', "Create a New Record", 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)."),
@@ -189,10 +189,14 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                     result, data = imap_server.search(None, '(UNSEEN)')
                     for num in data[0].split():
                         result, data = imap_server.fetch(num, '(RFC822)')
-                        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 server.object_id:
+                            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)
+                        else:
+                            res_id = mail_thread.message_catchall(cr, uid, data[0][1])
                         if res_id and server.action_id:
                             action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
                             imap_server.store(num, '+FLAGS', '\\Seen')
@@ -213,11 +217,14 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                     for num in range(1, numMsgs + 1):
                         (header, msges, octets) = pop_server.retr(num)
                         msg = '\n'.join(msges)
-                        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 server.object_id:
+                            res_id = mail_thread.message_process(cr, uid, server.object_id.model,
+                                                                 msg,
+                                                                 save_original=server.original,
+                                                                 strip_attachments=(not server.attach),
+                                                                 context=context)
+                        else:
+                            res_id = mail_thread.message_catchall(cr, uid, data[0][1])
                         if res_id and server.action_id:
                             action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
                         pop_server.dele(num)
diff --git a/addons/fetchmail/i18n/ar.po b/addons/fetchmail/i18n/ar.po
index 63f3b84fd7a..80989935d1f 100644
--- a/addons/fetchmail/i18n/ar.po
+++ b/addons/fetchmail/i18n/ar.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -35,7 +35,7 @@ msgstr "سكربت"
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
 msgid "Defines the order of processing, lower values mean higher priority"
-msgstr ""
+msgstr "تحديد ترتيب  العملية, القيم الأقل تعني الأولية"
 
 #. module: fetchmail
 #: help:fetchmail.server,is_ssl:0
@@ -43,11 +43,13 @@ msgid ""
 "Connections are encrypted with SSL/TLS through a dedicated port (default: "
 "IMAPS=993, POP3S=995)"
 msgstr ""
+"الإتصالات مشفرة بـ SSL/TLS من خلال منفذ مخصص (افتراضياً: IMPAS=993 "
+",POP35=995 )"
 
 #. module: fetchmail
 #: field:fetchmail.server,attach:0
 msgid "Keep Attachments"
-msgstr ""
+msgstr "حفظ الملحقات"
 
 #. module: fetchmail
 #: help:fetchmail.server,original:0
@@ -56,6 +58,8 @@ msgid ""
 "attached to each processed message. This will usually double the size of "
 "your message database."
 msgstr ""
+"إذا كان ينبغي أن تحتفظ بنسخة من كل رسالة إلكترونية كمرجع ملحق لكل عملية "
+"إرسال. هذه عادة تضاعف حجم قاعدة بيانات الرسائل"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -75,13 +79,13 @@ msgstr "بروتوكول POP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "جلب الآن"
 
 #. 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 "خادم الرسائل المستقبلة"
 
 #. module: fetchmail
 #: field:fetchmail.server,port:0
@@ -111,7 +115,7 @@ msgstr "خادم POP/IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Reset Confirmation"
-msgstr ""
+msgstr "إعادة تأكيد"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -121,12 +125,12 @@ msgstr "بروتوكول SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "رسالة بريد إلكتروني"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "تاريخ الجلب الأخير"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -134,6 +138,8 @@ msgid ""
 "Optional custom server action to trigger for each incoming mail, on the "
 "record that was created or updated by this mail"
 msgstr ""
+"اختياري عمل خادم مخصص لتحريك كل البريد الوارد، على السجل التي تم إنشاؤها أو "
+"تحديثها بواسطة هذا البريد"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -143,7 +149,7 @@ msgstr "عدد الرسائل"
 #. module: fetchmail
 #: field:fetchmail.server,original:0
 msgid "Keep Original"
-msgstr ""
+msgstr "حفظ بالأصل"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
diff --git a/addons/fetchmail/i18n/bg.po b/addons/fetchmail/i18n/bg.po
index f3d1d6aef6e..bc4c0df3e0d 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
index df022636f2d..ab9f66dd59a 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/da.po b/addons/fetchmail/i18n/da.po
index 53f049ce824..fd246217924 100644
--- a/addons/fetchmail/i18n/da.po
+++ b/addons/fetchmail/i18n/da.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index 68fc28f2872..717c7e1fd11 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po
index 0095f39217a..52ace50822f 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/en_GB.po b/addons/fetchmail/i18n/en_GB.po
index 769923facde..c8396e94547 100644
--- a/addons/fetchmail/i18n/en_GB.po
+++ b/addons/fetchmail/i18n/en_GB.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index 8aa3e84e968..6a63ee599f2 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/es_CR.po b/addons/fetchmail/i18n/es_CR.po
index 940ba19afa9..6448a69dd23 100644
--- a/addons/fetchmail/i18n/es_CR.po
+++ b/addons/fetchmail/i18n/es_CR.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "Language: es\n"
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/et.po b/addons/fetchmail/i18n/et.po
index 8da8f2b772e..910b69bb710 100644
--- a/addons/fetchmail/i18n/et.po
+++ b/addons/fetchmail/i18n/et.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/fi.po b/addons/fetchmail/i18n/fi.po
index 0b9307ecfe5..091472ddac7 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 13de818648b..5eb32edb0c2 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/gl.po b/addons/fetchmail/i18n/gl.po
index 9f2a1d36689..ddcf4baa030 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/hr.po b/addons/fetchmail/i18n/hr.po
index fbeb32e79c1..adbe9130520 100644
--- a/addons/fetchmail/i18n/hr.po
+++ b/addons/fetchmail/i18n/hr.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 8595a446a56..08be340471c 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index 9543164ee7f..be2d07b77da 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ja.po b/addons/fetchmail/i18n/ja.po
index 0701e3bb0f6..b9b85b9e060 100644
--- a/addons/fetchmail/i18n/ja.po
+++ b/addons/fetchmail/i18n/ja.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/lt.po b/addons/fetchmail/i18n/lt.po
index 7e0a0c3a559..a39d9fd3be6 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/lv.po b/addons/fetchmail/i18n/lv.po
index 3e61301d520..befe965177f 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/mn.po b/addons/fetchmail/i18n/mn.po
index 978bdaf0f9b..c6cfbd3fc62 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -25,17 +25,18 @@ msgstr "Баталсан"
 #. module: fetchmail
 #: field:fetchmail.server,server:0
 msgid "Server Name"
-msgstr ""
+msgstr "Серверийн Нэр"
 
 #. module: fetchmail
 #: field:fetchmail.server,script:0
 msgid "Script"
-msgstr ""
+msgstr "Скрипт"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
 msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
+"Боловсруулах эрэмбийг тодорхойлдог, бага утга нь өндөр урьтамжийг илэрхийлнэ."
 
 #. module: fetchmail
 #: help:fetchmail.server,is_ssl:0
@@ -43,11 +44,13 @@ msgid ""
 "Connections are encrypted with SSL/TLS through a dedicated port (default: "
 "IMAPS=993, POP3S=995)"
 msgstr ""
+"Холболт нь SSL/TLS-р шифрлэгдсэн. Тусгайлсан порттой (анхны утга: IMAPS=993, "
+"POP3S=995)"
 
 #. module: fetchmail
 #: field:fetchmail.server,attach:0
 msgid "Keep Attachments"
-msgstr ""
+msgstr "Хавсралтыг Үлдээх"
 
 #. module: fetchmail
 #: help:fetchmail.server,original:0
@@ -56,6 +59,14 @@ msgid ""
 "attached to each processed message. This will usually double the size of "
 "your message database."
 msgstr ""
+"Имэйлийг боловсруулсан процесс бүрт оригиналь имэйл нь сурвалж зорилгоор "
+"хадгалагдаж үлдэх нь зохимжтой. Энэ нь зурвасуудын хэмжээг хоёр дахин том "
+"болгодог.\r\n"
+"\r\n"
+"\r\n"
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -70,18 +81,18 @@ msgstr "Төлөв"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "POP"
-msgstr ""
+msgstr "POP"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "Одоо татах"
 
 #. 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 "Ирэх Мэйлийн Серверүүд"
 
 #. module: fetchmail
 #: field:fetchmail.server,port:0
@@ -96,12 +107,12 @@ msgstr "POP/IMAP Servers"
 #. module: fetchmail
 #: selection:fetchmail.server,type:0
 msgid "Local Server"
-msgstr ""
+msgstr "Локаль Сервер"
 
 #. module: fetchmail
 #: field:fetchmail.server,user:0
 msgid "Username"
-msgstr ""
+msgstr "Хэрэглэгчийн нэр"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -111,22 +122,22 @@ msgstr "POP/IMAP Server"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Reset Confirmation"
-msgstr ""
+msgstr "Баталгааг Буцаах"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Имэйл зурвас"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "Сүүлийн Татсан Огноо"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -134,16 +145,18 @@ msgid ""
 "Optional custom server action to trigger for each incoming mail, on the "
 "record that was created or updated by this mail"
 msgstr ""
+"Энэ ирэх мэйлээр үүсгэгдэж, шинэчлэгдсэн бичлэгээр өдөөгдөж ажиллах нэмэлт "
+"серверийн  үйлдэл"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "# of emails"
-msgstr ""
+msgstr "Имэйлүүдийн #"
 
 #. module: fetchmail
 #: field:fetchmail.server,original:0
 msgid "Keep Original"
-msgstr ""
+msgstr "Эхийг үлдээх"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
@@ -152,33 +165,35 @@ msgid ""
 "Here is what we got instead:\n"
 " %s"
 msgstr ""
+"Бидэнд оронд нь байгаа зүйл бол:\n"
+" %s"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 #: field:fetchmail.server,configuration:0
 msgid "Configuration"
-msgstr ""
+msgstr "Тохиргоо"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
-msgstr ""
+msgstr "Ирэх Мэйлийн Сервер"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Холболтын тест амжилтгүй боллоо!"
 
 #. module: fetchmail
 #: help:fetchmail.server,server:0
 msgid "Hostname or IP of the mail server"
-msgstr ""
+msgstr "Мэйл серверийн нэр эсвэл IP"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type IMAP."
-msgstr ""
+msgstr "Серверийн төрөл IMAP."
 
 #. module: fetchmail
 #: field:fetchmail.server,name:0
@@ -188,33 +203,33 @@ msgstr "Name"
 #. 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 "Тестлээд Батлах"
 
 #. module: fetchmail
 #: field:fetchmail.server,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Сервер үйлдэл"
 
 #. module: fetchmail
 #: field:mail.message,fetchmail_server_id:0
 msgid "Inbound Mail Server"
-msgstr ""
+msgstr "Орох мэйл сервер"
 
 #. module: fetchmail
 #: field:fetchmail.server,message_ids:0
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
-msgstr ""
+msgstr "Зурвас"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Search Incoming Mail Servers"
-msgstr ""
+msgstr "Ирэх Мэйл Серверүүдийг хайх"
 
 #. module: fetchmail
 #: field:fetchmail.server,active:0
@@ -227,6 +242,8 @@ msgid ""
 "Whether attachments should be downloaded. If not enabled, incoming emails "
 "will be stripped of any attachments before being processed"
 msgstr ""
+"Хавсралтууд нь татагдах эсэх. Хэрэв зөвшөөрөгдсөн бол имэйл нь "
+"боловсруулагдахаасаа өмнө бүх хавсралтыг татаж авна."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -241,12 +258,12 @@ msgstr "IMAP Сервер"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "IMAP"
-msgstr ""
+msgstr "IMAP"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type POP."
-msgstr ""
+msgstr "Серверийн төрөл POP."
 
 #. module: fetchmail
 #: field:fetchmail.server,password:0
@@ -256,7 +273,7 @@ msgstr "Password"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Actions to Perform on Incoming Mails"
-msgstr ""
+msgstr "Ирж байгаа имэйлүүд дээр хийгдэх үйлдлүүд"
 
 #. module: fetchmail
 #: field:fetchmail.server,type:0
@@ -276,12 +293,12 @@ msgstr "Серверийн мэдээлэл"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "If SSL required."
-msgstr ""
+msgstr "Хэрэв SSL шаардагдах бол."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced"
-msgstr ""
+msgstr "Дэвшилтэт"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -295,11 +312,14 @@ msgid ""
 "document type. This will create new documents for new conversations, or "
 "attach follow-up emails to the existing conversations (documents)."
 msgstr ""
+"Ирж байгаа имэйл бүрийг энэ баримтын төрөлийн ярилцлага байдлаар "
+"боловсруулна. Энэ нь  шинэ ярилцлагын хувьд шинэ баримт үүсгэнэ эсвэл байгаа "
+"ярилцлагын үргэлжлэл байвал түүнд хавсаргана."
 
 #. module: fetchmail
 #: field:fetchmail.server,object_id:0
 msgid "Create a New Record"
-msgstr ""
+msgstr "Шинэ бичлэг үүсгэх"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -380,3 +400,6 @@ msgstr "Мэйл сервер"
 
 #~ msgid "Fetch Emails"
 #~ msgstr "Fetch Emails"
+
+#~ msgid "Advanced options"
+#~ msgstr "Шилмэл сонголтууд"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index d7b468bbe48..bdaf96ee30e 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index 00695af2c1c..7a1b37cb07c 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 31063e3cf98..933e2012e73 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 6b74bfa4910..879d7c63ed8 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-30 04:55+0000\n"
-"X-Generator: Launchpad (build 15702)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ro.po b/addons/fetchmail/i18n/ro.po
index 4cbf47d99d3..ed8e1903518 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ru.po b/addons/fetchmail/i18n/ru.po
index f4a5bc32f37..a8e3d46d8fa 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sl.po b/addons/fetchmail/i18n/sl.po
index adba2e2466a..9a52db181de 100644
--- a/addons/fetchmail/i18n/sl.po
+++ b/addons/fetchmail/i18n/sl.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-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
index 540d41a6b70..e91b2e0477d 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index bcddb00bc19..9b52a6a08aa 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index 2364e839f97..dcb00ede4b4 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/tr.po b/addons/fetchmail/i18n/tr.po
index 5539f9a717e..f6d3f53f48d 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 5a7515d191e..7020822d5ee 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 4360b4300ef..f2da2574718 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: 2012-07-14 06:18+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0