Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120210044704-ffxh1ikqgom660lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120210045028-kbviilp8xdby42fi

26 files changed, 10997 insertions, 5741 deletions

diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
new file mode 100644
index 00000000000..4314fdbba5d
--- /dev/null
+++ b/addons/mail/i18n/ar.po
@@ -0,0 +1,508 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-01-10 21:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "تجميع حسب..."
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
+msgid "Partner"
+msgstr "شريك"
+
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "موضوع"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
+#, python-format
+msgid "On %(date)s, "
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "من"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "شهر"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "اسم الشريك"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "تاريخ"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "محفوظات"
+
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr "مرفقات"
+
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr "نسخة"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr " مشغل "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "مراجع"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
+#, python-format
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "إلى"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "تفاصيل"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "البريد الإلكتروني"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "نسخة مخفية"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 887d668afb9..8ee56cbd0e7 100644
--- a/addons/mail/i18n/bg.po
+++ b/addons/mail/i18n/bg.po
@@ -7,354 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-03-28 20:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Идентификатор на ресурса"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Методът не е внедрен"
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "От"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Групиране по..."
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Бележка"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Групиране по..."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Нишка"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Подробности"
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Контрагент"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Относно"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Описание"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "От"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "До"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Дата"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Име на обект"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Име на контрагент"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Възможности"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Имейли"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Етап"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
+msgid "Re:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Имейл от"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Нишка"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Месец"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Съобщения"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Отговорности на потребителя"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Име на контрагент"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Скрито копие"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Дата"
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "История"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Отпратки"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Прикачени файлове"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Отваряне на документ"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr ""
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Копие до"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " на "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Месец"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Отпратки"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "До"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Подробности"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
+msgid "You"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Собственик"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Съобщение"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Имейли"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Относно"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Съобщения"
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Скрито копие"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "ID на съобщение в пощенски сървър"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " на "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index 2222f9da37c..896bf29ed43 100644
--- a/addons/mail/i18n/ca.po
+++ b/addons/mail/i18n/ca.po
@@ -7,361 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-05-26 05:41+0000\n"
 "Last-Translator: cubells <vicent@vcubells.net>\n"
 "Language-Team: Catalan <ca@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID del registre"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Mètode no implementat"
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "De"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Obre dades adjuntes"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Detalls del missatge"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Id del missatge"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID referència"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Agrupa per..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Històric passarel·la de correu"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Nota"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Agrupa per..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Error! No podeu crear membres associats recursius."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Id del missatge en email"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Destinataris email"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Detalls"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Fil"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Històric passarel·la de correu"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Eines servidor correu"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Seguidors per email"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Assumpte"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
-msgstr " escrit el %s:\n"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Descripció"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Per"
+msgid "On %(date)s, "
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "De"
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Fa referència a emails"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Destinataris de l'email en còpia carbó (CC)."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Sistema de passarel·la de correu"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nom de l'objecte"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nom d'empresa"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Fils passarel·la de correu"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Oportunitat"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Correus electrònics"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Fase"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " nota afegida en "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Email de"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Fil"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mes"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Missatge passarel·la de correu"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Cerca email"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Missatges"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nom d'empresa"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Usuari responsable"
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertit en oportunitat"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Cco"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "És històric?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Destintaris de l'email en còpia carbó oculta (cco)."
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "Missatge de passarel·la de correu"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Històric"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Referències"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Fil de la passarel·la de correu"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Adjunts"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Obre el document"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Detalls de l'email"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Cc"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
-msgstr " el %s:\n"
+msgid " on "
+msgstr " a "
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mes"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Cerca email"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Referències"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Mostra text"
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "rebre"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Per"
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detalls"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
 msgstr ""
-"La passarel·la de correu genèrica permet enviar i rebre emails\n"
-"* Històric d'emails\n"
-"* Integració fàcil amb qualsevol mòdul"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Estatus canviat a: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Mostra text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Propietari"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Fase canviada a: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Missatge"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Correus electrònics"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Assumpte"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Missatges"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Id del missatge en servidor de correu"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " escrit en "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
 
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " a "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
new file mode 100644
index 00000000000..5d1ea93f01e
--- /dev/null
+++ b/addons/mail/i18n/da.po
@@ -0,0 +1,508 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-01-27 09:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
+#, python-format
+msgid "On %(date)s, "
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
+#, python-format
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 73e5e576d06..02d704db19d 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -7,360 +7,510 @@ 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-04-03 09:21+0000\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-02-09 15:36+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Ressource ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Methode ist nicht implementiert"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Von"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr "Mitteilung Typ"
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Immer EMails nach Versendung löschen"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr "Öffne zugehöriges Dokument"
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Öffne Anhang"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Details Nachricht"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Nachricht ID"
-
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Referenz ID"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Historie Mailgateway"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr "Kommunikation Geschichte"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Anmerkung"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
-
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Nachricht ID der Email"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Email Empfänger"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Details"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "Email schreiben"
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr "Text Version der Mitteilung"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr "Textkörper"
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr "Mitteilung Empfänger"
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr "Text Inhalt"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr "Empfangen"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Beitrag"
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Historie Mailgateway"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Email Server Werkzeuge"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "EMail Verfolger"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr "Ausgehender Mailserver"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr "Storniert"
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr "Antwort an"
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "Rich-text/HTML Version der Nachricht"
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr "Autom. Löschen"
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "Verdeckte Mail Empfänger"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Betreff"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
-msgstr " geschrieben am %s:\n"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "An"
+msgid "On %(date)s, "
+msgstr "Am %(date)s, "
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "EMail Referenzen"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Von"
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Carbon Copy Email Empf."
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr "EMail Nachricht"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr "Senden"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr "Antworten"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr "Gesendet"
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "Auswahl des Typs der Nachricht, 'HTML' oder 'Text'."
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr "Empfänger"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr "Email-Zusammensetzung Assistent"
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr "zugehörige Dokumenten-ID"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr "Erweitert"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr "Re:"
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Email Gateway System"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr "zugehöriges Dokumenten-Modell"
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Datum"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Suche EMail"
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Object Name"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "Originalversion der Nachricht, wie sie über das Netz versendet wurde"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Partner Name"
 msgstr "Partner Name"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Mailgateway Beiträge"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr "Wiederholen"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr "Postausgang"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr "Sofort senden"
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr "Zugehörige Partner"
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Datum"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Verkaufschance"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "EMails"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr "Erweiterte Filter..."
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Stage"
-msgstr "Stufe"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+msgid "%(sender_name)s wrote:"
+msgstr "%(sender_name)s schrieb:"
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr "Rich-Text Inhalt"
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr "Original"
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
-msgid " added note on "
-msgstr " hinzugefügter Hinweis "
-
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "EMail von"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Beitrag"
+msgid "History"
+msgstr "Historie"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mailgateway Nachricht"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr "Nachricht-ID"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Nachrichten"
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr "Anhänge"
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Verantwortlicher Benutzer"
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr "CC"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Konvertiert zu Verkaufschance"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Bcc"
+msgid " on "
+msgstr " EMail von "
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "Historie EMail"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Blind Carbon Copy Email Empf."
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "Mailgateway Nachricht"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
-#, python-format
-msgid "History"
-msgstr "Historie"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+"Dauerhaftes Löschen dieser E-Mail nach dem Absenden, um Platz zu sparen"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
 msgid "References"
 msgstr "Referenzen"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Mailgateway Beitrag"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
-msgid "Attachments"
-msgstr "Anhänge"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Öffne Dokument"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Textbereich"
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Email Details"
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
-msgid "Cc"
-msgstr "CC"
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr "Öffnen"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid " on %s:\n"
-msgstr " am %s:\n"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr "[OpenERP-Weiterleitung-schlug fehl] %s"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Monat"
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr "zugehöriger Benutzer"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Suche EMail"
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+"Kompletter Nachrichtenvorspann, zB SMTP Session Header (normalerweise nur "
+"für einlangende EMails)"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
-#, python-format
-msgid "receive"
-msgstr "empfangen"
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr "Monat Erstellung"
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "An"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Details"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr "EMail Threads"
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
 msgstr ""
-"Das allgemeine EMail Gateway ermöglicht Senden und Empfangen von EMails\n"
-"   * EMail Historie   * Einfache Integration anderer Module"
+"Absender der Nachricht lt. Benutzereinstellung. Wenn leer, dann ist es eine "
+"Nachricht aber kein Mail"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
-#, python-format
-msgid "Changed Status to: "
-msgstr "Ändere Status zu: "
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr "Textkörper (einfach)"
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Textbereich"
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr "Sie"
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr "Eindeutige Identifikation der Nachricht"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr "Textkörper (RTF)"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+"%s schrieb am %s: \n"
+" Betreff: %s \n"
+"\t"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Besitzer"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "EMails"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
-#, python-format
-msgid "Changed Stage to: "
-msgstr "Ändere Bearbeitungsstufe auf: "
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Nachrichten"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Nachricht"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr "Nachrichten-Vorspann"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Betreff"
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Nachricht ID Email Server."
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr "mail.message.common"
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " schreibe zu "
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "Nachricht Referenzen, wie z. B. Kennungen von vorherigen Nachrichten"
 
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen."
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "CC Nachrichten Empfänger"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr "Auslieferung gescheitert"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr "EMail Nachricht"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr "EMail Thread"
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr "Filter"
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " EMail von "
+msgid "Mail attachment"
+msgstr "Nachrichtenbeilage"
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "Bevorzugte Antwortadresse für diese Nachricht"
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 80124705ef2..6facc34480a 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-13 23:04+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -15,354 +15,495 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID del registro"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Método no implementado"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "De"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Abrir datos adjuntos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Detalles del mensaje"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "ID del mensaje"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID referencia"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Histórico pasarela de correo"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Nota"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "ID del mensaje en el email."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Destinatarios del email."
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Detalles"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Hilo"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Histórico pasarela de correo"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Herramientas servidor correo"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Destinatarios del email"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Descripción"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "De"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Para"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Referencias de los emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Destinatarios del email en copia carbón (CC)."
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Sistema de pasarela de correo"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Fecha"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nombre del objeto"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nombre de empresa"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Hilos pasarela de correo"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Oportunidad"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Emails"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Etapa"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " añadida nota en "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Email de"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Hilo"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mes"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mensaje pasarela de correo"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Buscar email"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nombre de empresa"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Usuario responsable"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Fecha"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertido en oportunidad"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Cco"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "¿Es histórico?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Destintarios del email en copia carbón oculta (cco)."
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "Mensaje de pasarela de correo"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Histórico"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Referencias"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Hilo de la pasarela de correo"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Abrir documento"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Detalles del email"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Cc"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " en "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mes"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Referencias"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Buscar email"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar texto"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "recibir"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
-"La pasarela de correo genérica permite enviar y recibir emails\n"
-"    * Histórico de emails\n"
-"    * Integración fácil con cualquier módulo"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Estado cambiado a: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Mostrar texto"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Propietario"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Etapa cambiada a: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Mensaje"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emails"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Asunto"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "ID del mensaje en el servidor de correo."
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#, python-format
-#~ msgid " on "
-#~ msgstr " en "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " wrote on "
-#~ msgstr " escrito el "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index faa7dbcfac3..e7ac51c9915 100644
--- a/addons/mail/i18n/es_PY.po
+++ b/addons/mail/i18n/es_PY.po
@@ -7,350 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-03-22 10:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID del recurso"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Método no implementado"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
 msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
+msgid "Re:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: view:mail.message:0
+msgid "User"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "History"
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
-msgid "Attachments"
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
+msgid "You"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
 msgstr ""
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index 1b95d6f05c1..bc12f47dbce 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -7,354 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-06-20 10:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Resurssi ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Metodia ei ole toteutettu"
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Lähettäjä"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Avaa liitteet"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Viestin yksityiskohdat"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Viestin ID"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Viite id"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Postiyhteyden historia"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Huomautus"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Ryhmittely.."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Viestin id sähköpostissa"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Sähköpostin vastaanottajat"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Yksityiskohdat"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Keskustelu"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Sähöpostivälittäjän historia"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Sähköpostipalvelimen työkalut"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Sähköpostin seuraajat"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Yhteistyökumppani"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Aihe"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Kuvaus"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Lähettäjä"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Vastaanottaja"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Viittaavat sähköpostit"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Kopio viestistä vastaanottajille"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Sähköpostivälitysjärjstelmä"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Päiväys"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Objektin nimi"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Kumppanin Nimi"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "sähköpostivälittäjän keskustelut"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Mahdollisuus"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Sähköpostit"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Vaihe"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " lisäsi huomautuksen "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Sähköposti lähettäjältä"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Keskustelu"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Kuukausi"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "sähköpostivälittäjän viesti"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Sähköpostin haku"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Viestit"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Vastuunalainen käyttäjä"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Kumppanin Nimi"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Muutettu mahdollisuudeksi"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Piilokopio"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "onko historiaa?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Piilokopion vastaanottajat"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "Postinvälittäjän viesti"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Historia"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Viitteet"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "sähköpostivälittäjän keskustelu"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Liitteet"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Avaa asiakirja"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Sähköpostin yksityiskohdat"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Kopio"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Kuukausi"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Sähköpostin haku"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Viitteet"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Näytä teksti"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "vastaanota"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Vastaanottaja"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Yksityiskohdat"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Tila muutettu : "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Näytä teksti"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Omistaja"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Vaihe muutettu : "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Viesti"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Sähköpostit"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Aihe"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Viestin ID sähköpostipalvelimella."
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Piilokopio"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " wrote on "
-#~ msgstr " kirjoitti "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 9906fc12ec4..2f639ec88da 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -7,362 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-18 16:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: French <fr@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Identifiant de la ressource"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Méthode non implémentée"
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "De"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Ovrir les pièces jointes"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Détails du message"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Identifiant du message"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID de référence"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Grouper par ..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Historique de la passerelle mail"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Note"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Grouper par ..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Identifiant du courriel"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Destinataire du courriel"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Détails"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Discussion"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Historique de la passerelle mail"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Outils pour le serveur de courriel"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Faire suivre le courriel"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partenaire"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Sujet"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Description"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "De"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "À"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Courriels de références"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Envoyer un copie carbone aux destinataires"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Système de passerelle des courriels"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Date"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nom de l'objet"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nom du Partenaire"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Discussion de la passerelle courriel"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Opportunité"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Courriels"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Étape"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " note ajoutée "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Auteur du courriel"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Discussion"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mois"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Message pour la passerelle mail"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Recherche des emails"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Messages"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nom du Partenaire"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Utilisateur responsable"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Date"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertir en opportunité"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Copie cachée à (BCC)"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "Est historisé ?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Envoyer une copie caché aux destinataires"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "Message de la passerelle mail"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Historique"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Références"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Discussion de la passerelle mail"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Ouvrir le document"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Détails des emails"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Copie à (CC)"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " sur "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mois"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Références"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Recherche des emails"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Texte affiché"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "Reçu"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "À"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Détails"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
-"Le système de passrelle mail générique autorise l'envoi et la réceptions de "
-"mails\n"
-"    * Historique des emails\n"
-"    * Intégration facilité avec les autres modules"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Changer l'état à: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Texte affiché"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Propriétaire"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Changer l'étape en: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Message"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Courriels"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Sujet"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Messages"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Identifiant du message sur le serveur de mail"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#, python-format
-#~ msgid " on "
-#~ msgstr " sur "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Copie cachée à (BCC)"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " wrote on "
-#~ msgstr " écrit sur "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index 04454211d35..754e129e547 100644
--- a/addons/mail/i18n/gl.po
+++ b/addons/mail/i18n/gl.po
@@ -7,360 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-03-22 10:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID do Recurso"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Método non aplicado"
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Desde"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Abrir datos anexos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Detalles da mensaxe"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "ID da Mensaxe"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID referencia"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Rexistros pasarela de correo"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Nota"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Erro! Non pode crear membros asociados recorrentes."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "ID da mensaxe no e-mail."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Destinatarios do e-mail."
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Detalles"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Fío"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Rexistro da pasarela de correo"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Ferramentas do servidor de correo"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Destinatarios do e-mail"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Socio"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Descrición"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Desde"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Ata"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Referencias dos e-mails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Destinatarios do email en copia carbón (CC)."
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Sistema de pasarela de correo"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nome do obxecto"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nome do socio"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Fíos pasarela de correo"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Oportunidade"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "E-mails"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Fase"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " nota engadida en "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "E-mail de"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Fío"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mes"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mensaxe da pasarela de correo electrónico"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Buscar e-mail"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Mensaxes"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nome do socio"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Usuario responsable"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertido en oportunidade"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Cco"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "É o rexistro?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Destinatarios do e-mail en copia carbón oculta (cco)."
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "Mensaxe da pasarela de correo"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Historia"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Referencias"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Fío da pasarela de correo"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Anexos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Abrir un documento"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Detalles do e-mail"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Cc"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " en "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mes"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Referencias"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Buscar e-mail"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Amosar texto"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "recibir"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Ata"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
-"A pasarela de correo xenérica permite enviar e recibir e-mails* Rexistro dos "
-"e-mails* Integración doada con calquera módulo"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Estado cambiado a: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Amosar texto"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Propietario"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Etapa cambiada a: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Mensaxe"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mails"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Asunto"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "ID da mensaxe no servidor de correo."
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " escrito o "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " en "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
new file mode 100644
index 00000000000..18d8f737be9
--- /dev/null
+++ b/addons/mail/i18n/hr.po
@@ -0,0 +1,508 @@
+# Croatian 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: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2011-12-22 17:13+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Attachments"
+msgstr "Otvori privitke"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Message Details"
+msgstr "Detalji poruke"
+
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
+#, python-format
+msgid "On %(date)s, "
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Pretraživanje e-mailova"
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Naziv partnera"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Povijest"
+
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr "Privici"
+
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Reference"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Prikaži tekst"
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
+#, python-format
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Za"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detalji"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-pošta"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index e283e9d0e0c..17bb23d4d44 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-21 12:01+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\n"
@@ -14,343 +14,495 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Erőforrás ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Módszer nincs végrehajtva"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Mellékletek megnyitása"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Üzenet részletei"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Üzenet ID"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Hivatkozás ID"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Csoportosítás..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Mailgateway előzmény"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Megjegyzés"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Hiba! Nem hozhat létre rekurzív társult tagokat."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Részletek"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "E-mailszerver eszközök"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Tárgy"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Leírás"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Dátum"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Partner neve"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Lehetőség"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "E-mailek"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
+msgid "Re:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "E-mail innen"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Hónap"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "E-mail keresésée"
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Partner neve"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Üzenetek"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Felelős felhasználó"
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
+#. module: mail
+#: view:mail.message:0
+msgid "User"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Titkos másolat"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Dátum"
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Előzmény"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Hivatkozások"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Mellékletek"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Dokumentum megnyitása"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "E-mail részletek"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Másolat"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Hónap"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "E-mail keresésée"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Hivatkozások"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Részletek"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
+msgid "You"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Tulajdonos"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Üzenet"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mailek"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Tárgy"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Üzenetek"
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Titkos másolat"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
 msgstr ""
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index e37a2ced4de..cd5cae3b76e 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -7,350 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-15 19:32+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID Risorsa"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Il metodo non è implementato"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Da"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Apri allegati"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Dettagli messaggio"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "ID messaggio"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID riferimento"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Storico server di posta"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Nota"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Errore! Non è possibile creare membri associati ricorsivi."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "ID messaggio su email"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Destinatari email"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Argomento"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Dettagli"
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Strumenti server email"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Oggetto"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Descrizione"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Da"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "A"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Destinatario email in copia conforme"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nome Oggetto"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nome Partner"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Opportunità"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Email"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Stadio"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
+msgid "Re:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Email da"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Argomento"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mese"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Messaggio server mail"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Cerca email"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Messaggi"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Utente Responsabile"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nome Partner"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertita a opportunità"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "CCN"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: view:mail.message:0
+msgid "User"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Destinatario email in copia conforme nascosta"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "History"
-msgstr "Storico"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
-msgid "Attachments"
-msgstr "Allegati"
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Storico"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Apri documento"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Dettagli email"
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr "Allegati"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "CC"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mese"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Cerca email"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "A"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Dettagli"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Stato cambiato a: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Proprietario"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Cambio stadio a: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Email"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Messaggio"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Messaggi"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Oggetto"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "CCN"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
 msgstr ""
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index c73d287b878..46e63fed5e2 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -7,358 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-16 11:31+0000\n"
-"Last-Translator: Paulius Sladkevičius - inovera.lt <komsas@gmail.com>\n"
+"Last-Translator: Paulius Sladkevičius <paulius@hacbee.com>\n"
 "Language-Team: Lithuanian <lt@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Resurso ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Metodas nėra įgyvendintas"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Nuo"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Atverti priedus"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Žinutės detalės"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Žinutės Id"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Nuorodos Id"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Grupuoti pagal..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "El. pašto šliuzo istorija"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Pastabos"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Grupuoti pagal..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Klaida! Jūs negalite sukurti rekursiškai susijusio nario."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Žinutės id el. laiške"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "El. laiško gavėjai"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Informacija"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Gija"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "El. pašto šliuzo istorija"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "El. pašto serverio įrankiai"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "El. laiško sekėjai"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partneris"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Tema"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Aprašymas"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Nuo"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Kam"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "El. laiškų nuorodos."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "El. laiško kopijos gavėjai"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "El. pašto šliuzo sistema"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Objekto pavadinimas"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Partnerio pavadinimas"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "El. pašto šliuzo gijos"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Pardavimo galimybė"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "El. laiškai"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Etapas"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " pridėta pastaba "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "El. laiškas nuo"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Gija"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mėnuo"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "El. pašto šliuzo žinutė"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "El. pašto paieška"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Žinutė"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Atsakingas naudotojas"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Partnerio pavadinimas"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Konvertuota į pardavimų galimybę"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Bcc"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "Yra istorijoje?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Slapta el. pašto kopija gavėjams"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "el. pašto šliuzo žinutė"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Istorija"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Nuorodos"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "El. pašto šliuzo gija"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Priedai"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Atverti dokumentą"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "El. laiškas plačiau"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Cc"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " ant "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mėnuo"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Nuorodos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "El. pašto paieška"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Rodomas tekstas"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "gauti"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Kam"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Informacija"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Būsena pakeista į: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Rodomas tekstas"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Savininkas"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Būsena pakeista į: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "El. laiškai"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
 msgstr "Žinutė"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Tema"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Žinutės id el. pašto serveryje."
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " įrašytas "
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
 
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " ant "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index 70f978a8d06..bafee96ff42 100644
--- a/addons/mail/i18n/lv.po
+++ b/addons/mail/i18n/lv.po
@@ -7,354 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-13 23:09+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Resursa ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Metode nav realizēta"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "No"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Atvērt piesaistnes"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Ziņojuma sīkāka informācija"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Ziņojuma ID"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Atsauces ID"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Grupēt pēc..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "E-pasta vārtejas vēsture"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Piezīme"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Grupēt pēc..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Kļūda! Nevar izveidot rekursīvus asociētos dalībniekus."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Ziņojuma ID e-pastā"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "E-pasta saņēmēji"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Sīkāka informācija"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Sarakste"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "E-pasta vārtejas vēsture"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "E-pasta servera rīki"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "E-pasta sekotāji"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partneris"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Temats"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Apraksts"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "No"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Kam"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Atsauces e-pasti"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "E-pasta kopijas saņēmēji"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "E-pasta vārtejas sistēma"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Datums"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Objekta nosaukums"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Partnera nosaukums"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "E-pasta vārtejas sarunas"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Izdevība"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "E-pasti"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Posms"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " piezīme pievienota "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "E-pasts no"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Sarakste"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mēnesis"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "E-pasta vārtejas ziņojums"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Meklēt e-pastā"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Ziņojumi"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Atbildīgais lietotājs"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Partnera nosaukums"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Pārveidots par izdevību"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Bcc"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "Vai vēsture?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Slēptās e-pasta kopijas saņēmēji"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "e-pasta vārtejas ziņojums"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Vēsture"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Atsauces"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "E-pasta vārtejas sarakste"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Piesaistnes"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Atvērt dokumentu"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "E-pasta sīkāka informācija"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "CC"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mēnesis"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Meklēt e-pastā"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Atsauces"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Teksts"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "saņemt"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Kam"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Sīkāka informācija"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Mainīts statuss uz: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Teksts"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Īpašnieks"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Posms mainīts uz: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Ziņojums"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-pasti"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Temats"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Ziņojumi"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Ziņojuma ID e-pasta serverī."
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Bcc"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " wrote on "
-#~ msgstr " uzrakstīts "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index c521e310fa9..3ef2542a909 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -7,361 +7,514 @@ 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-03-20 16:59+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-02-09 17:41+0000\n"
+"Last-Translator: Erwin <Unknown>\n"
 "Language-Team: Dutch <nl@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Resource ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Methode is niet geïmplementeerd"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Van"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
+"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr "Bericht type"
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Verwijder e-mails definitief na verzending"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr "Open gerelateerde document"
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Open bijlagen"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Bericht details"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Bericht Id"
-
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Referentie Id"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Mailgateway geschiedenis"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr "Communicatie historie"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Notitie"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Group By..."
 msgstr "Groepeer op..."
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Fout ! U kunt geen recursieve aangesloten leden maken."
-
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Bericht Id op Email."
-
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Email ontvangers"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Details"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "Email opstellen"
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr "Platte tekst versie van het bericht"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr "Body"
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr "Ontvangers van het bericht"
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr "Tekst inhoud"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr "Ontvangen"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Conversatie"
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Mailgate geschiedenis"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Email Server Tools"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Email volgers"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr "Uitgaande mailserver"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr "Antwoord aan"
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "Rich-tekst/HTML versie van het bericht"
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr "Auto-verwijder"
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "Blind carbon copy ontvangers van het bericht"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Relatie"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Onderwerp"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
-msgstr " schreef op %s:\n"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Aan"
+msgid "On %(date)s, "
+msgstr "Op %(date)s, "
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "email referenties."
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Van"
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Carbon Copy email ontvangers"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr "E-mail bericht"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr "Verzend"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr "Mislukt"
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr "Beantwoorden"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr "Verzonden"
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+"Soort bericht, normaliter 'html' of 'tekst', wordt gebruikt om te kiezen "
+"voor platte tekst of tekst met opmaak."
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr "Ontvangers"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr "E-mail opmaak wizard"
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr "Gerelateerde document ID"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr "Antw:"
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Email gateway systeem"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr "Gerelateerde Document model"
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Datum"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Maand"
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Objectnaam"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Email zoeken"
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+"Originele versie van het bericht, zoals het was verzonden op het netwerk"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Partner Name"
 msgstr "Relatienaam"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Mailgateway conversatie"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr "Opnieuw"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr "Uitgaand"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr "Nu verzenden"
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr "Gekoppelde relatie"
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Datum"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Verkoopkans"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "E-mails"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr "Uitgebreide filters..."
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Stage"
-msgstr "Stadium"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+msgid "%(sender_name)s wrote:"
+msgstr "%(sender_name)s schreef:"
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr "Rich-tekst inhoud"
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr "Origineel"
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
-msgid " added note on "
-msgstr " notitie toegevoegd op "
-
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Email van"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Conversatie"
+msgid "History"
+msgstr "Geschiedenis"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mailgateway bericht"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr "Bericht-Id"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr "Bijlagen"
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Verantwoordelijke gebruiker"
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr "CC"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Omgezet in verkoopkans"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "BCC"
+msgid " on "
+msgstr " op "
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "Is geschiedenis?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Blind Carbon Copy email ontvangers"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "mailgate bericht"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
-#, python-format
-msgid "History"
-msgstr "Geschiedenis"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+"Om ruimte te besparen, verwijder deze e-mail permanent na het versturen"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
 msgid "References"
 msgstr "Referenties"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Mailgateway conversatie"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
-msgid "Attachments"
-msgstr "Bijlagen"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Document openen"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Tekst weergeven"
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Email details"
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr "Annuleren"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
-msgid "Cc"
-msgstr "CC"
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr "Open"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid " on %s:\n"
-msgstr " op %s:\n"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr "[OpenERP-Forward-Failed] %s"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Maand"
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr "Gerelateerde gebruiker"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Email zoeken"
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+"Volledige bericht koppen, bijvoorbeeld SMTP sessie koppen (normaliter alleen "
+"beschikbaar bij inkomende berichten)"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
-#, python-format
-msgid "receive"
-msgstr "ontvangen"
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr "Aanmaak maand"
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Aan"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Details"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr "E-mail discussies"
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
 msgstr ""
-"Het generieke email gateway systeem laat u emails zenden en ontvangen\n"
-"    * geschiedenis van emails\n"
-"    * eenvoudige integratie met elke module"
+"Bericht verzender, zoals ingevuld bij de voorkeuren van de gebruiker. Indien "
+"leeg is dit geen mail maar een bericht."
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
-#, python-format
-msgid "Changed Status to: "
-msgstr "Status gewijzigd in: "
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr "Body (Eenvoudig)"
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Tekst afbeelden"
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr "U"
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr "Bericht unieke identifier"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr "Body (Rich)"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+"%s schreef op %s: \n"
+" Onderwerp: %s \n"
+"\t"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Eigenaar"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mails"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
-#, python-format
-msgid "Changed Stage to: "
-msgstr "Stadium gewijzigd in: "
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Bericht"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr "Bericht koppen"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Onderwerp"
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "BCC"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Bericht Id in email server."
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr "mail.message.common"
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " schreef op "
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "Bericht referenties, zoals identifiers van vorige berichten"
 
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken"
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "Carbon copy ontvangers van het bericht"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr "Afleveren mislukt"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr "E-mail bericht"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr "E-mail discussie"
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr "Filters"
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " op "
+msgid "Mail attachment"
+msgstr "E-mail bijlage"
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "Voorkeur antwoordadres voor het bericht"
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index c8b9fa1eaae..d85498ac872 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -7,358 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-13 16:42+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID zasobu"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Metoda nie zaimplementowana"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Od"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Otwórz załączniki"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Szczegóły wiadomości"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "ID wiadomości"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID odnośnika"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Historia bramki pocztowej"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Notatka"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Grupuj wg..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
 msgstr ""
-"Błąd ! Tworzenie rekursywnych elementów skojarzonych jest zabronione."
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "ID wiadomości w Emailu"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Odbiorcy wiadomości"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Szczegóły"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Wątek"
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Historia bramki pocztowej"
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Narzędzia serwera pocztowego"
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Temat"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Opis"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Od"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Do"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Odnośniki."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Odbiorcy kopii wiadomości"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "System bramki pocztowej"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nazwa obiektu"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nazwa partnera"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Wątki bramki pocztowej"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Szansa"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Emaile"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Etap"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " dodał uwagę do "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Wiadomość od"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Wątek"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Przeszukaj wiadomości"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Wiadomość Mailgateway"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Wiadomości"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nazwa partnera"
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Użytkownik odpowiedzialny"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
-msgstr "Skonwertował do szansy"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Ukryta kopia"
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "Istnieje historia?"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Odbiorcy ukrytych kopii wiadomości"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Historia"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Odnośniki"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Wątek bramki pocztowej"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Załączniki"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Otwórz dokument"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Szczegóły wiadomości"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Kopia"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Miesiąc"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Przeszukaj wiadomości"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Odnośniki"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Wyświetla tekst"
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
 msgstr ""
-"Podstawowy system bramki pocztowej do wysyłania odbierania wiadomości\n"
-"    * Historia wiadomości\n"
-"    * Łatwa integracja z dowolnym modułem"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Do"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Szczegóły"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Zmienił stan na: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Wyświetla tekst"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Właściciel"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Zmienił etap na: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Wiadomość"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emaile"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Temat"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "ID wiadomości w serwerze pocztowym"
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Ukryta kopia"
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " wrote on "
-#~ msgstr " napisał "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index 6c6871f6e42..d3b9a974f88 100644
--- a/addons/mail/i18n/pt.po
+++ b/addons/mail/i18n/pt.po
@@ -7,361 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-12 19:10+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID do recurso"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "O método não está implementado"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "De"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Abrir anexos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Detalhes da mensagem"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "ID da mensagem"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID da referência"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Nota"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Erro! Não pode criar membros associados recursivamente."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "ID da mensagem no email."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Destinatários da mensagem"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Detalhes"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Remetente e Destinatários"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Parceiro"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Descrição"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "De"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Para"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nome do objeto"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nome do parceiro"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Oportunidade"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Mensagens"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Estágio"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " nota adicionada em "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Remetente da mensagem"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Pesquisa de email"
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nome do parceiro"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Utilizador responsável"
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertida em Oportunidade"
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "CCO"
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Histórico"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Referências"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Anexos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Abrir documento"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Detalhes da mensagem"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "CC"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " em "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mês"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Referências"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Pesquisa de email"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar texto"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
 msgstr ""
-"O sistema de email genérico permite o envio e recepção de emails\n"
-"    * Histórico de mensagens\n"
-"    * Fácil integração com qualquer módulo"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Estado mudado para: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Mostrar texto"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Dono"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Estágio mudado para: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Mensagem"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Mensagens"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Assunto"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "ID da mensagem no servidor."
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " escrito em "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "CCO"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " em "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index 8dade6ce036..74a3fe90524 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -7,361 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-17 18:39+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID do recurso"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Método não está implementado"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "De"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Abrir Anexos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Detalhes da Mensagem"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Id da Mensagem"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Id de Referência"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Histórico do Gateway de Email"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Anotação"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Agrupar Por..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Erro ! Você não pode criar membros recursivos associados."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Id da Mensagem no Email"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Destinatários de Email"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Detalhes"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Tópico"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Histórico do Gateway de Email"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Ferramentas do Servidor de Email"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Encaminhamentos de Email"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Parceiro"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Descrição"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "De"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Para"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Emails relacionados"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Destinatários de Email Com Cópia"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Sistema de Gateway de Email"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Nome do objeto"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Nome do Parceiro"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Tópicos do Gateway de Email"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Oportunidade"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Emails"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Estágio"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " nota adicionada em "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Email de"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Tópico"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Mês"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mensagem do Gateway de Email"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Pesquisar Email"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Nome do Parceiro"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Usuário Responsável"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertido para Oportunidade"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Cópia Oculta"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "é Histórico?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Destinatário de Email com Cópia Oculta"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "Mensagem do Gateway de Email"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Histórico"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Referências"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Tópico do Gateway de Email"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Anexos"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Abrir Documento"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Detalhes do Email"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Cc"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " em "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Mês"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Referências"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Pesquisar Email"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Mostrar o Texto"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "receber"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
-"O sistema genérico de gateway de email permite enviar e receber emails\n"
-"    * Histórico por Emails\n"
-"    * Integração Fácil com qualquer Módulo"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Mudar Status para: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Mostrar o Texto"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Dono"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Status Alterado para: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Mensagem"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emails"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Assunto"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Id da Mensagem no Servidor de Email"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " escrito em "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Cópia Oculta"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " em "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index e148b71e4f1..bf81ff0cf56 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.po
@@ -7,360 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-24 15:23+0000\n"
 "Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: Romanian <ro@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "ID resursă"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Metodă neimplementată"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "De la"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
-msgstr "Deschidere ataşamente"
+msgstr "Deschide ataşamentele"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Detalii mesaj"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "ID mesaj"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID referinţă"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Grupează după..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Istoric mesagerie"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Notă"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Grupează după..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Eroare ! Nu puteţi crea membri asociaţi recursiv."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "ID mesaj în mesaj"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "destiantarii mesajului"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Filet"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Detalii"
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "Istoric mesagerie"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Utilitare server e-mail"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "Mesaje de continuare"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partener"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Subiect"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Descriere"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "De la"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Către"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "Mesaje de referinţă"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Destinatari copie carbon"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Sistem expediţie email"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Data"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Denumirea obiectului"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Numele partenerului"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "Procese expeditie email"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Oportunitate"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "E-mail-uri"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Etapă"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " a adăugată note la data de "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "E-mail de la"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Proces"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Luna"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mesaj de la mesagerie"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Căutare e-mail"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Mesaje"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Utilizator responsabil:"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Numele partenerului"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "Convertit în oportunitate"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Bcc"
-
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "Este istoric?"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Destinatari copie carbon nevăzută"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "mesaj de la mesagerie"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Istoric"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Referinţe"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "Proces de expediţie email"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Atașamente"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Deschide documentul"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Detalii e-mail"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
-msgstr "Cc"
+msgstr "Cc (copie carbon)"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " în data de "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Luna"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Referinţe"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Căutare e-mail"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Afişează textul"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "recepţie"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
 msgstr ""
-"* Istoricul mesageriei\n"
-"    * Integrare uşoară cu orice modul"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Către"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detalii"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Starea a devenit: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Afişare text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Proprietar"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Stadiul a devenit: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Mesaj"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mail-uri"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Subiect"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Mesaje"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "ID al mesajului în serverul de e-mail"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " a scris la data de "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Copie oarbă (BCC)"
 
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " în data de "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 55126c0e127..ed5a69ef342 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -7,358 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-25 08:25+0000\n"
 "Last-Translator: Alexey Y. Fedotov <Unknown>\n"
 "Language-Team: Russian <ru@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Идентификатор ресурса"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Метод не реализован"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "От"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Открыть вложения"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Подробности сообщения"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Идентификатор сообщения"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Идентификатор связанного сообщения"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Объеденить по..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "История почтового шлюза"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Примечание"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Объеденить по..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "Идентификатор сообщения эл. почты."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Получатели эл. почты"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Подробности"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Цепочка"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Инструменты почтового сервера"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Контрагент"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Тема"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Описание"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "От"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Кому"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "Получатели копий эл. письма"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "Система шлюзов эл. почты"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Дата"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Название объекта"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Имя партнера"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Предложение"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Эл. почта"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Этап"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
+msgid "Re:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Эл. письмо от"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Цепочка"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Месяц"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Соообщение почтового шлюза"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "Искать эл. почту"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Сообщения"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "Ответственный пользователь"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Имя партнера"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
-msgstr "Преобразовано в предложение"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "Скрытая копия"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "История?"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "Получатели скрытых копий эл. писем"
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "История"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "Ссылки"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "Прикрепленные файлы"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "Открыть документ"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "Детали эл. письма"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "Копия"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " на "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Месяц"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Ссылки"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "Искать эл. почту"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Вывести текст"
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "получать"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
 msgstr ""
-"Общая система шлюзов электронной почты позволяет отправлять и получать "
-"электронную почту\n"
-"    * История электронных писем\n"
-"    * Легкая интеграция с любым модулем"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Кому"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Подробности"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Статус изменен на: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Вывести текст"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Владелец"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "Этап изменен на: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Сообщение"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Эл. почта"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Тема"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Скрытая копия"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "Идентификатор сообщения на почтовом сервере."
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
 
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " на "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index 737f23de680..d37f32b1536 100644
--- a/addons/mail/i18n/sl.po
+++ b/addons/mail/i18n/sl.po
@@ -7,350 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2010-12-16 17:40+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Slovenian <sl@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Oznaka vira"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "Metoda ni implementirana"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Od"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Odprte priloge"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "Podrobnosti sporočila"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Oznaka sporočila"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "Oznaka povezave"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Združi po ..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "Zgodovina posrednika za pošto"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Opomba"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Združi po ..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Napaka! Ni mogoče rekurzivno kreirati pridruženih članov"
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "Prejemniki e-pošte"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Podrobnosti"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Nit"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Stranka"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Opis"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Od"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Za"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Datum"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Naziv objekta"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Naziv partnerja"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Priložnost"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Elektronska pošta"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "Stopnja"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
+msgid "Re:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "Sporočilo od"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "Nit"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Naziv partnerja"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "User"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "History"
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
-msgid "Attachments"
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Za"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Podrobnosti"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
+msgid "You"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Elektronska pošta"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
 msgstr ""
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index bb1e8c711a3..59f0ec62779 100644
--- a/addons/mail/i18n/sr@latin.po
+++ b/addons/mail/i18n/sr@latin.po
@@ -7,350 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2010-12-10 18:25+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Od"
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
 msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid "Stage"
+msgid "Re:"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
-#, python-format
-msgid " added note on "
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "History"
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
-msgid "Attachments"
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
+msgid "You"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
 msgstr ""
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index 4ce20b26290..b2e2027af97 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -7,358 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-24 23:17+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "Resurs ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "Från"
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "Öppna bifogade filer"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "Meddelande id"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "Anteckning"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "Gruppera på..."
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "Fel! Du kan inte skapa rekursivt kopplade medlemmar."
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "Detaljer"
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "Email server verktyg"
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Ämne"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "Beskrivning"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Från"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "Till"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "Datum"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "Objektnamn"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "Partner namn"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "Tillfälle"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "Epost"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "E-post från"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Månad"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "Meddelanden"
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Partner namn"
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
-#, python-format
-msgid "Converted to Opportunity"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
 msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "Historik"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
-msgid "Attachments"
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr " på "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
 msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
-msgid "Cc"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Visa text"
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid " on %s:\n"
+msgid "[OpenERP-Forward-Failed] %s"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "Månad"
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
-#, python-format
-msgid "receive"
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Till"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detaljer"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
 msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "Ändrad status till: "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "Visa text"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "Ägare"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
-msgstr "Meddelande"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "Epost"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "Ämne"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
 msgstr ""
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " skrev på "
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
 
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " på "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
new file mode 100644
index 00000000000..3538d00afca
--- /dev/null
+++ b/addons/mail/i18n/tr.po
@@ -0,0 +1,517 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-02-09 21:42+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr "Mesaj tipi"
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Gönderdikten sonra epostaları kalıcı olarak sil."
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr "İlgili dökümanı aç"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Attachments"
+msgstr "Ekleri Aç"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Message Details"
+msgstr "Mesaj Detayları"
+
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr "İletişim geçmişi"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Grupla..."
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "E-posta Yaz"
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr "Mesajın düz-metin versiyonu"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr "İleti metni"
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr "Mesaj Alıcıları"
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr "Metin içeriği"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr "Alınan"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "Konu"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr "giden mail sunucusu"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr "İptal Edilmiş"
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr "Cevapla"
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "Zengin-metin / HTML versiyonu"
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr "Otomatik Sil"
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "BCC gizli kopya alıcılar"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
+msgid "Partner"
+msgstr "Cari"
+
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Konu"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
+#, python-format
+msgid "On %(date)s, "
+msgstr "%(date)s,  tarihinde "
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Kimden"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr "E-posta mesajı"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr "Gönder"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr "Başarısız"
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr "Cevapla"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr "Gönderilmiş"
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+"Mesaj tipi, genellikle HTML ya da düz-metin, düz-metin ya da HTML içerikleri "
+"seçmek için kullanılır."
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr "Alıcılar"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr "E-posta oluşturma sihirbazı"
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr "İlgili Döküman ID"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr "Yanıt:"
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr "İlgili Döküman Modeli"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Ay"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "E-posta Ara"
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "Mesajın networkte gönderildiği orjinal hali"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "Cari Adı"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr "Tekrar dene"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr "Giden"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr "Şimdi Gönder"
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr "İlgili Cari"
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr "Kullanıcı"
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "Tarih"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr "Gelişmiş Filtreler..."
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr "%(sender_name)s yazmış:"
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr "Zengin-metin İçerik"
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr "Orjinal"
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Geçmiş"
+
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr "Mesaj-Id"
+
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr "Ekler"
+
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr "İlgili Kopyası (CC)"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr " tarihinde "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "Bu mesajı gönderdikten sonra yerden kazanmak için sil"
+
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "Referanslar"
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "Metin Göster"
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr "İptal"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr "Aç"
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
+#, python-format
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr "[OpenERP-Forward-başarısız] %s"
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr "İlgili Kullanıcı"
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+"Tam mesaj başlığı, ör: SMTP oturum başlıkları (genelde sadece gelen "
+"mesajlarda bulunur)"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr "Oluşturma Ayı"
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "Kime"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "Detaylar"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr "Eposta Konuları"
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+"Mesajı Gönderen, Kullanıcı seçeneklerinden alındı. Eğer boşsa bu bir e-posta "
+"değil mesajdır."
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr "Mesaj (düz metin)"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr "Siz"
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr "Tekil mesaj tanımlayıcısı"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr "Mesaj (zengin metin)"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+"%s yazmış %s: \n"
+"Konu: %s \n"
+"\t"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-postalar"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr "Mesajlar"
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr "Mesaj Başlıkları"
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "Gizli Kopya"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr "mail.message.common"
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "Mesaj referansları, tanımlayıcılar ya da önceki mesajlar"
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "CC (carbon kopya) mesaj alıcıları"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr "Gönderim Başarısız"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr "E-posta Mesajı"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr "E-posta Konusu"
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr "Filtreler"
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr "Posta Eki"
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "Mesaj için tercih edilen cevap adresi"
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 7ea611a9a85..71c636f5fd6 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -7,358 +7,502 @@ 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"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2011-01-12 11:02+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: mail_gateway
-#: field:mailgate.message,res_id:0
-msgid "Resource ID"
-msgstr "资源ID"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:68
-#: code:addons/mail_gateway/mail_gateway.py:71
-#: code:addons/mail_gateway/mail_gateway.py:89
-#, python-format
-msgid "Method is not implemented"
-msgstr "未实现的方法"
+"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,email_from:0
-msgid "From"
-msgstr "发件人"
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
 msgid "Open Attachments"
 msgstr "打开附件"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
+#. module: mail
+#: view:mail.message:0
 msgid "Message Details"
 msgstr "消息详情"
 
-#. module: mail_gateway
-#: field:mailgate.message,message_id:0
-msgid "Message Id"
-msgstr "消息ID"
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "相关ID"
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "分组..."
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgateway History"
-msgstr "邮件网关日志"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:249
-#, python-format
-msgid "Note"
-msgstr "备注"
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Group By..."
-msgstr "分组..."
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr ""
 
-#. module: mail_gateway
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,message_id:0
-msgid "Message Id on Email."
-msgstr "电子邮件的消息ID"
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_to:0
-msgid "Email Recipients"
-msgstr "邮件收件人"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Details"
-msgstr "详细信息"
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "线程"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Mailgate History"
-msgstr "邮件网关日志"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_email_server_tools
-msgid "Email Server Tools"
-msgstr "邮件服务器工具"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Followers"
-msgstr "电子邮件追随者"
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_res_partner
-#: view:mailgate.message:0
-#: field:mailgate.message,partner_id:0
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr "业务伙伴"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "主题"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
-msgid " wrote on %s:\n"
+msgid "On %(date)s, "
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,description:0
-#: field:mailgate.message,message:0
-msgid "Description"
-msgstr "说明"
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "发件人"
 
-#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
-msgstr "收件人"
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,references:0
-msgid "References emails."
-msgstr "相关的邮件列表"
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_cc:0
-msgid "Carbon Copy Email Recipients"
-msgstr "抄送邮件的收件人"
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
-msgid "Email Gateway System"
-msgstr "电子邮件网关系统"
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,date:0
-msgid "Date"
-msgstr "日期"
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,model:0
-msgid "Object Name"
-msgstr "对象名"
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Partner Name"
-msgstr "业务伙伴名称"
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
-msgid "Mailgateway Threads"
-msgstr "邮件网关线程"
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:247
-#, python-format
-msgid "Opportunity"
-msgstr "商机"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
-#: view:mailgate.message:0
-#: field:res.partner,emails:0
-msgid "Emails"
-msgstr "电子邮件"
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:252
-#, python-format
-msgid "Stage"
-msgstr "阶段"
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:250
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
-msgid " added note on "
-msgstr " 增加备注在 "
+msgid "Re:"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,email_from:0
-msgid "Email From"
-msgstr "邮件发件人"
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document model"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Thread"
-msgstr "线程"
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "月"
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "邮件网关消息"
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr "电子邮件搜索"
 
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
-#: field:mailgate.thread,message_ids:0
-msgid "Messages"
-msgstr "消息"
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr "业务伙伴名称"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,user_id:0
-msgid "User Responsible"
-msgstr "责任人"
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr "日期"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:248
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Converted to Opportunity"
-msgstr "转化为商机"
+msgid "%(sender_name)s wrote:"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,email_bcc:0
-msgid "Bcc"
-msgstr "密件抄送"
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text contents"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,history:0
-msgid "Is History?"
-msgstr "是日志"
-
-#. module: mail_gateway
-#: help:mailgate.message,email_bcc:0
-msgid "Blind Carbon Copy Email Recipients"
-msgstr "密件抄送的收件人"
-
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "mailgate message"
-msgstr "邮件网关消息"
-
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:148
-#: view:mailgate.thread:0
-#: view:res.partner:0
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr "日志"
 
-#. module: mail_gateway
-#: field:mailgate.message,references:0
-msgid "References"
-msgstr "引用"
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mailgate_thread
-#: view:mailgate.thread:0
-msgid "Mailgateway Thread"
-msgstr "邮件网关线程"
-
-#. module: mail_gateway
-#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
-#: view:mailgate.message:0
-#: field:mailgate.message,attachment_ids:0
-#: view:mailgate.thread:0
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr "附件"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Open Document"
-msgstr "打开文档"
-
-#. module: mail_gateway
-#: view:mailgate.thread:0
-msgid "Email Details"
-msgstr "电子邮件详情"
-
-#. module: mail_gateway
-#: field:mailgate.message,email_cc:0
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr "抄送"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:254
+#. module: mail
+#: code:addons/mail/mail_message.py:159
 #, python-format
-msgid " on %s:\n"
+msgid " on "
+msgstr " 在 "
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Month"
-msgstr "月"
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr "引用"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Email Search"
-msgstr "电子邮件搜索"
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr "显示文本"
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:561
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
 #, python-format
-msgid "receive"
-msgstr "接收"
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr "收件人"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr "详细信息"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
 
-#. module: mail_gateway
-#: model:ir.module.module,description:mail_gateway.module_meta_information
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
 msgid ""
-"The generic email gateway system allows to send and receive emails\n"
-"    * History for Emails\n"
-"    * Easy Integration with any Module"
-msgstr "通过电子邮件网关系统允许你发送和接受邮件"
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:255
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
-msgid "Changed Status to: "
-msgstr "状态更改为： "
+msgid "You"
+msgstr ""
 
-#. module: mail_gateway
-#: field:mailgate.message,display_text:0
-msgid "Display Text"
-msgstr "显示文本"
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Owner"
-msgstr "所有者"
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
 
-#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:253
+#. module: mail
+#: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "Changed Stage to: "
-msgstr "状态阶段为： "
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr "电子邮件"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-msgid "Message"
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
 msgstr "消息"
 
-#. module: mail_gateway
-#: view:mailgate.message:0
-#: field:mailgate.message,name:0
-msgid "Subject"
-msgstr "主题"
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message headers"
+msgstr ""
 
-#. module: mail_gateway
-#: help:mailgate.message,ref_id:0
-msgid "Message Id in Email Server."
-msgstr "电子邮件消息ID"
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr "密件抄送"
 
-#, python-format
-#~ msgid " wrote on "
-#~ msgstr " 写在 "
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
 
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
 #, python-format
-#~ msgid " on "
-#~ msgstr " 在 "
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""