Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110106043500-7v9lu0vz6rw06og9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106053849-1bfeq2m1gsv0j789

12 files changed, 827 insertions, 684 deletions

diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index a978f0253f9..b471392065a 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.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: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-29 10:01+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "EMail Konto Konfiguration"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "E-Mails für mehrere Elemente in Postausgang gespeichert"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -46,19 +47,6 @@ msgstr ""
 "oder beantragen ein persönliches Mailkonto für die Versendung."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-"Eine Email Vorlage ist ein Email die als Bestandteil einer Marketing "
-"Kampagne versendet wird. Sie können eine Personalisierung der Vorlage nach "
-"Ihren Vorstellungen vornehmen, um definierte Platzhalter automatisch mit "
-"Ihren Daten bei dem Emailversand zu füllen."
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Persönl. Emails"
@@ -106,7 +94,7 @@ msgid "Body"
 msgstr "Hauptteil"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "Löschen des Eintrag fehlgeschlagen"
@@ -202,7 +190,7 @@ msgid "Email Account"
 msgstr "EMail Konto"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "EMail Versand scheitert für ein o. mehrere Objekte."
@@ -316,7 +304,7 @@ msgid "From Email"
 msgstr "Von EMail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Warnung"
@@ -365,7 +353,7 @@ msgid "Subject"
 msgstr "Betreff"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Grund: %s"
@@ -382,7 +370,7 @@ msgid "Template"
 msgstr "Vorlage"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -444,13 +432,13 @@ msgid "Resource"
 msgstr "Ressource"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Ausgehende Verbindung fehlgeschlagen"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "EMail von Konto %s erfolgreich versendet."
@@ -472,7 +460,7 @@ msgid "The text version of the mail"
 msgstr "Text Version der EMail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Email Anhang)"
@@ -522,7 +510,7 @@ msgid "Attach my signature to mail"
 msgstr "Signatur zu eMail anhängen"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -664,7 +652,7 @@ msgid "Mail Details"
 msgstr "EMail Details"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "SMTP Server oder Port nicht spezifiziert"
@@ -792,7 +780,7 @@ msgid "Outgoing"
 msgstr "Postausgang"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr "Datumzeit Extraktion fehlgeschlagen.Datum:%s \tFehler:%s"
@@ -852,7 +840,7 @@ msgid "Save in Drafts"
 msgstr "Speichern als Entwurf"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -872,10 +860,16 @@ msgid "Language"
 msgstr "Sprache"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -905,7 +899,7 @@ msgstr ""
 "Nur Benutzer dieser Gruppe dürfen Emails auf Basis dieses Templates versenden"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Versende Mail (%s)"
@@ -953,7 +947,7 @@ msgid "Text, otherwise HTML"
 msgstr "Text, alternativ HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Kopie der Vorlage "
@@ -974,7 +968,7 @@ msgid "Close"
 msgstr "Beenden"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Fehler beim Senden der E-Mail: %s"
@@ -990,7 +984,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Haupttext (HTML - Nur Web-Client)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "%s (Email Anhang)"
@@ -1001,6 +995,15 @@ msgid "Sending"
 msgstr "Versende"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Berechtigte Benutzer Gruppe"
@@ -1016,7 +1019,13 @@ msgid "User Information"
 msgstr "Benutzer Information"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Aktionen"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1035,9 +1044,9 @@ msgstr ""
 "verwendet werden, z.B. 2009_S0003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Verzeichnis"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Datum an dem EMail gesendet werden soll"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1046,12 +1055,12 @@ msgid "Trash"
 msgstr "Müll"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Datum an dem EMail gesendet werden soll"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "EMail Eingang"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1062,13 +1071,13 @@ msgstr ""
 "Fehler: %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Fehlendes EMail Konto"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "SMTP Test Verbindung war erfolgreich"
@@ -1124,11 +1133,6 @@ msgid "Null Value"
 msgstr "Null Wert"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "EMail Eingang"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Vorlage Sprache"
@@ -1174,7 +1178,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "EMails"
@@ -1262,7 +1265,7 @@ msgid "Model"
 msgstr "Modul"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr "Kern Verbindung für die vorgegebene ID existiert nicht"
@@ -1273,7 +1276,7 @@ msgid "Corporate"
 msgstr "Gesellschaft"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1305,9 +1308,9 @@ msgid "Mail Format"
 msgstr "Mail Format"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Aktionen"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Verzeichnis"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1320,13 +1323,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Gebe Port Nummer ien, z.B. 25 oder 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "EMail Vorlage"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1344,8 +1349,8 @@ msgid "Has Attachments"
 msgstr "Hat Dateianhang"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Keine Beschreibung"
@@ -1411,3 +1416,14 @@ msgstr "Keine Beschreibung"
 
 #~ msgid "The certificate ID of the module must be unique !"
 #~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid ""
+#~ "An email template is an email document that will be sent as part of a "
+#~ "marketing campaign. You can personalize it based on specific customer "
+#~ "profile fields so that their names or other partner related information can "
+#~ "be automatically inserted in it."
+#~ msgstr ""
+#~ "Eine Email Vorlage ist ein Email die als Bestandteil einer Marketing "
+#~ "Kampagne versendet wird. Sie können eine Personalisierung der Vorlage nach "
+#~ "Ihren Vorstellungen vornehmen, um definierte Platzhalter automatisch mit "
+#~ "Ihren Daten bei dem Emailversand zu füllen."
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index 76a622073bc..8b89ba338fa 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/i18n/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-24 00:37+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@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: 2010-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,7 +28,7 @@ msgid "Email Account Configuration"
 msgstr "Configuración cuenta de correo"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr ""
@@ -36,7 +36,8 @@ msgstr ""
 "Buzón de salida."
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -48,19 +49,6 @@ msgstr ""
 "le cree una cuenta de correo electrónico personal."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-"Una plantilla de correo electrónico es un documento de correo electrónico "
-"que se enviará como parte de una campaña de marketing. Puede personalizarlo "
-"en base a campos específicos del perfil del cliente para que su nombre u "
-"otra información de la empresa se puedan insertar automáticamente."
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Emails personales"
@@ -107,7 +95,7 @@ msgid "Body"
 msgstr "Cuerpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "La eliminación del registro ha fallado"
@@ -204,7 +192,7 @@ msgid "Email Account"
 msgstr "Cuenta de email"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "El envío de email falló debido a uno o varios objetos"
@@ -318,7 +306,7 @@ msgid "From Email"
 msgstr "Desde email"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -367,7 +355,7 @@ msgid "Subject"
 msgstr "Asunto"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Razones: %s"
@@ -384,7 +372,7 @@ msgid "Template"
 msgstr "Plantilla"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -446,13 +434,13 @@ msgid "Resource"
 msgstr "Recurso"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Fallo de test de connexión saliente"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Correo desde la cuenta %s enviado correctamente."
@@ -474,7 +462,7 @@ msgid "The text version of the mail"
 msgstr "Versión texto del mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Adjunto Email)"
@@ -524,7 +512,7 @@ msgid "Attach my signature to mail"
 msgstr "Adjuntar mi firma al mail"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -665,7 +653,7 @@ msgid "Mail Details"
 msgstr "Detalles del mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "Servidor SMTP o puerto no informados"
@@ -794,7 +782,7 @@ msgid "Outgoing"
 msgstr "Saliente"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr "Extracción de fecha y hora ha fallado. Fecha:%s \tError:%s"
@@ -854,7 +842,7 @@ msgid "Save in Drafts"
 msgstr "Guardar en borradores"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -874,10 +862,16 @@ msgid "Language"
 msgstr "Idioma"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -908,7 +902,7 @@ msgstr ""
 "plantila"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar mail (%s)"
@@ -955,7 +949,7 @@ msgid "Text, otherwise HTML"
 msgstr "Texto, sino HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Copia de plantilla "
@@ -976,7 +970,7 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Error enviando correo electrónico: %s"
@@ -992,7 +986,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Cuerpo (HTML- cliente web únicamente)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "%s (documento adjunto al email)"
@@ -1003,6 +997,15 @@ msgid "Sending"
 msgstr "Enviando"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Grupos de usuarios autorizados"
@@ -1018,7 +1021,13 @@ msgid "User Information"
 msgstr "Información usuario"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1037,9 +1046,9 @@ msgstr ""
 "nombre del fichero, por ejemplo 2009_SO003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Carpeta"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Fecha en la cual el email fue enviado / recibido"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1048,12 +1057,12 @@ msgid "Trash"
 msgstr "Basura"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Fecha en la cual el email fue enviado / recibido"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Buzón de correo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1064,13 +1073,13 @@ msgstr ""
 "Error: %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Falta la cuenta de correo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "El test de la conexión SMTP es correcto"
@@ -1127,11 +1136,6 @@ msgid "Null Value"
 msgstr "Valor nulo"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "Buzón de correo"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Idioma plantilla"
@@ -1179,7 +1183,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Emails"
@@ -1267,7 +1270,7 @@ msgid "Model"
 msgstr "Modelo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr "No existe conexión principal para el ID indicado"
@@ -1278,7 +1281,7 @@ msgid "Corporate"
 msgstr "Corporativo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1310,9 +1313,9 @@ msgid "Mail Format"
 msgstr "Formato mail"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Acciones"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Carpeta"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1325,13 +1328,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Introduzca el número de puerto, p.ej. 25 o 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "plantilla email"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1348,8 +1353,8 @@ msgid "Has Attachments"
 msgstr "Contiene datos adjuntos"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Sin descripción"
@@ -1388,3 +1393,14 @@ msgstr "Sin descripción"
 #~ msgstr ""
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 #~ "especial!"
+
+#~ msgid ""
+#~ "An email template is an email document that will be sent as part of a "
+#~ "marketing campaign. You can personalize it based on specific customer "
+#~ "profile fields so that their names or other partner related information can "
+#~ "be automatically inserted in it."
+#~ msgstr ""
+#~ "Una plantilla de correo electrónico es un documento de correo electrónico "
+#~ "que se enviará como parte de una campaña de marketing. Puede personalizarlo "
+#~ "en base a campos específicos del perfil del cliente para que su nombre u "
+#~ "otra información de la empresa se puedan insertar automáticamente."
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index 0a79fbca407..1f070a7a51b 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-20 07:54+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -27,13 +27,14 @@ msgid "Email Account Configuration"
 msgstr "Configuration du compte de courriel"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "Courriels pour plusieurs articles sauvegardés dans la boite d'envoi"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -45,19 +46,6 @@ msgstr ""
 "demandez l'ouverture d'un compte de courriel personnel."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-"Un modèle de courriel est un courriel qui sera envoyé lors d'une campagne "
-"marketing. Vous pouvez le personnaliser en fonction de champs propres à "
-"chaque client, de façon à ce que leur noms ou d'autres informations du "
-"partenaire soient insérées automatiquement."
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Courriels personnels"
@@ -105,7 +93,7 @@ msgid "Body"
 msgstr "Corps"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "La suppression de l'enregistrement a échoué"
@@ -202,7 +190,7 @@ msgid "Email Account"
 msgstr "Compte de courriel"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "L'envoi du courriel a échoué pour un ou plusieurs objets"
@@ -316,7 +304,7 @@ msgid "From Email"
 msgstr "Courriel de l'expéditeur"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Attention"
@@ -365,7 +353,7 @@ msgid "Subject"
 msgstr "Objet"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Raison : %s"
@@ -382,7 +370,7 @@ msgid "Template"
 msgstr "Modèle"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -443,13 +431,13 @@ msgid "Resource"
 msgstr "Ressource"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Échec du test de la connexion sortante"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Courriel du compte %s envoyé avec succès."
@@ -471,7 +459,7 @@ msgid "The text version of the mail"
 msgstr "La version texte du courriel"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (pièce jointe au courriel)"
@@ -521,7 +509,7 @@ msgid "Attach my signature to mail"
 msgstr "Joindre ma signature au courriel"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -663,7 +651,7 @@ msgid "Mail Details"
 msgstr "Détails du courriel"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "Serveur ou port SMTP non défini"
@@ -792,7 +780,7 @@ msgid "Outgoing"
 msgstr "Sortant"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -855,7 +843,7 @@ msgid "Save in Drafts"
 msgstr "Sauvegarder dans les brouillons"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -875,10 +863,16 @@ msgid "Language"
 msgstr "Langue"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -909,7 +903,7 @@ msgstr ""
 "courriels à partir de ce modèle"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Envoyer le courriel (%s)"
@@ -957,7 +951,7 @@ msgid "Text, otherwise HTML"
 msgstr "Texte, sinon HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Copie du modèle "
@@ -978,7 +972,7 @@ msgid "Close"
 msgstr "Fermer"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Erreur lors de l'envoi du courriel : %s"
@@ -994,7 +988,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Corps (HTML - uniquement pour client web)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "%s (pièce jointe du courriel)"
@@ -1005,6 +999,15 @@ msgid "Sending"
 msgstr "Envoi en cours"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Groupes utilisateurs autorisés"
@@ -1020,7 +1023,13 @@ msgid "User Information"
 msgstr "Informations utilisateur"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Actions"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1039,9 +1048,9 @@ msgstr ""
 "dans le nom du fichier, par exemple 2009_SO003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Dossier"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Date à laquelle le courriel a été envoyé ou reçu"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1050,12 +1059,12 @@ msgid "Trash"
 msgstr "Poubelle"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Date à laquelle le courriel a été envoyé ou reçu"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Boite de réception des courriels"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1066,13 +1075,13 @@ msgstr ""
 "Erreur : %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Compte courriel manquant"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "Le test de connexion SMTP a réussi"
@@ -1129,11 +1138,6 @@ msgid "Null Value"
 msgstr "Valeur nulle"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "Boite de réception des courriels"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Langue pour les modèles"
@@ -1181,7 +1185,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Courriels"
@@ -1265,7 +1268,7 @@ msgid "Model"
 msgstr "Modèle"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr "Connexion inexistante pour l'identifiant spécifié"
@@ -1276,7 +1279,7 @@ msgid "Corporate"
 msgstr "Commun à toute la société"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1308,9 +1311,9 @@ msgid "Mail Format"
 msgstr "Format du courriel"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Actions"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Dossier"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1323,13 +1326,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Saisir le numéro de port, par exemple 25 ou 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "Modèle courriel"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1346,8 +1351,8 @@ msgid "Has Attachments"
 msgstr "Possède des pièces jointes"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Pas de description"
@@ -1364,3 +1369,14 @@ msgstr "Pas de description"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML incorrect dans l'architecture de la vue !"
+
+#~ msgid ""
+#~ "An email template is an email document that will be sent as part of a "
+#~ "marketing campaign. You can personalize it based on specific customer "
+#~ "profile fields so that their names or other partner related information can "
+#~ "be automatically inserted in it."
+#~ msgstr ""
+#~ "Un modèle de courriel est un courriel qui sera envoyé lors d'une campagne "
+#~ "marketing. Vous pouvez le personnaliser en fonction de champs propres à "
+#~ "chaque client, de façon à ce que leur noms ou d'autres informations du "
+#~ "partenaire soient insérées automatiquement."
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index f0d91002a7b..747a066542e 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-29 07:23+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "Configurazione Account email"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "Emails per item multipli salvati in outbox"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -46,19 +47,6 @@ msgstr ""
 "template, oppure impostare al vostro account una email personale."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-"Un \"template email\" è un documento email che viene spedito come parte di "
-"una campagna marketing. E' possibile personalizzarlo basandosi su uno "
-"specifico campo del profilo cliente, così facendo i loro nomi, o altre "
-"informazioni ad essi relativi, possono essere automaticamente inseriti."
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Email personali"
@@ -106,7 +94,7 @@ msgid "Body"
 msgstr "Corpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "Eliminazione del record fallita"
@@ -203,7 +191,7 @@ msgid "Email Account"
 msgstr "Account Email"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "Invio dell'email fallito per uno o più oggetti."
@@ -317,7 +305,7 @@ msgid "From Email"
 msgstr "Da email"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Attenzione"
@@ -366,7 +354,7 @@ msgid "Subject"
 msgstr "Oggetto"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Motivazione: %s"
@@ -383,7 +371,7 @@ msgid "Template"
 msgstr "Template"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -444,13 +432,13 @@ msgid "Resource"
 msgstr "Risorsa"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Test connessione in uscita fallito"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Email dall'Account %s spedita correttamente."
@@ -472,7 +460,7 @@ msgid "The text version of the mail"
 msgstr "Versione in formato testo dell'email"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Allegato Email)"
@@ -520,7 +508,7 @@ msgid "Attach my signature to mail"
 msgstr "Allega la mia firma all'email"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -662,7 +650,7 @@ msgid "Mail Details"
 msgstr "Dettagli email"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "Server SMTP o porta non specificata"
@@ -791,7 +779,7 @@ msgid "Outgoing"
 msgstr "In uscita"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr "Estrazione data / ora fallita. Data: %s \t Errore: %s"
@@ -851,7 +839,7 @@ msgid "Save in Drafts"
 msgstr "Salva in bozze"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -871,10 +859,16 @@ msgid "Language"
 msgstr "Lingua"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -905,7 +899,7 @@ msgstr ""
 "Modello"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Invio Email (%s)"
@@ -952,7 +946,7 @@ msgid "Text, otherwise HTML"
 msgstr "Testo, altrimenti HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Copia del modello "
@@ -973,7 +967,7 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Errore inviando l'email: %s"
@@ -989,7 +983,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Corpo (HTML - Solo dal client Web)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "%s (Allegato Email)"
@@ -1000,6 +994,15 @@ msgid "Sending"
 msgstr "Invio in corso"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Gruppi utente consentiti"
@@ -1015,7 +1018,13 @@ msgid "User Information"
 msgstr "Informazioni dell'utente"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Azioni"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1034,9 +1043,9 @@ msgstr ""
 "es.: 2009_SO003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Cartella"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Data in cui l'email è stata ricevuta / spedita"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1045,12 +1054,12 @@ msgid "Trash"
 msgstr "Cestino"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Data in cui l'email è stata ricevuta / spedita"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Email Mailbox"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1060,13 +1069,13 @@ msgstr ""
 "Errore: %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Email account mancante"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "Test di connessione SMTP eseguito con successo"
@@ -1121,11 +1130,6 @@ msgid "Null Value"
 msgstr "Valore nullo"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "Email Mailbox"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr ""
@@ -1171,7 +1175,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Email"
@@ -1259,7 +1262,7 @@ msgid "Model"
 msgstr "Modello"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr ""
@@ -1270,7 +1273,7 @@ msgid "Corporate"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1302,9 +1305,9 @@ msgid "Mail Format"
 msgstr "Formato dell'email"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Azioni"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Cartella"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1317,13 +1320,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Inserire il numero della porta: es: 25 o 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "template email"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr "Email da account %s fallito. Probabile causa: Account non approvato"
@@ -1339,8 +1344,8 @@ msgid "Has Attachments"
 msgstr "Presenta allegati"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Nessuna descrizione"
@@ -1379,3 +1384,14 @@ msgstr "Nessuna descrizione"
 
 #~ msgid "Size of the field can never be less than 1 !"
 #~ msgstr "La dimensione del campo non può mai essere minore di 1!"
+
+#~ msgid ""
+#~ "An email template is an email document that will be sent as part of a "
+#~ "marketing campaign. You can personalize it based on specific customer "
+#~ "profile fields so that their names or other partner related information can "
+#~ "be automatically inserted in it."
+#~ msgstr ""
+#~ "Un \"template email\" è un documento email che viene spedito come parte di "
+#~ "una campagna marketing. E' possibile personalizzarlo basandosi su uno "
+#~ "specifico campo del profilo cliente, così facendo i loro nomi, o altre "
+#~ "informazioni ad essi relativi, possono essere automaticamente inseriti."
diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po
index 31f9c426fb2..c20e121c765 100644
--- a/addons/email_template/i18n/mn.po
+++ b/addons/email_template/i18n/mn.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-21 14:03+0000\n"
 "Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -46,15 +47,6 @@ msgstr ""
 "personal email account."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Хувийн Э-мэйл"
@@ -101,7 +93,7 @@ msgid "Body"
 msgstr "Их бие"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr ""
@@ -191,7 +183,7 @@ msgid "Email Account"
 msgstr "Э-мэйл бүртгэх"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr ""
@@ -299,7 +291,7 @@ msgid "From Email"
 msgstr "Э-мэйлээс"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Анхааруулга"
@@ -343,7 +335,7 @@ msgid "Subject"
 msgstr "Гарчиг"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr ""
@@ -360,7 +352,7 @@ msgid "Template"
 msgstr "Загвар"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -417,13 +409,13 @@ msgid "Resource"
 msgstr "Нөөц"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Бүртгэлийн э-мэйл %s амжилттай илгээгдлээ."
@@ -445,7 +437,7 @@ msgid "The text version of the mail"
 msgstr "The text version of the mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Э-мэйл хавсралт)"
@@ -494,7 +486,7 @@ msgid "Attach my signature to mail"
 msgstr "Attach my signature to mail"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -634,7 +626,7 @@ msgid "Mail Details"
 msgstr "Мэйлийн дэлгэрэнгүй"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "SMTP SERVER or PORT not specified"
@@ -762,7 +754,7 @@ msgid "Outgoing"
 msgstr "Гаралт"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -822,7 +814,7 @@ msgid "Save in Drafts"
 msgstr "Save in Drafts"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -842,10 +834,16 @@ msgid "Language"
 msgstr "Хэл"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -875,7 +873,7 @@ msgstr ""
 "Only users from these groups will be allowed to send mails from this Template"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Мэйл илгээх (%s)"
@@ -922,7 +920,7 @@ msgid "Text, otherwise HTML"
 msgstr "Text, otherwise HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Хуулбарлах "
@@ -943,7 +941,7 @@ msgid "Close"
 msgstr "Хаах"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -959,7 +957,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Body (HTML-Web Client Only)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "%s (Э-мэйл хавсралт)"
@@ -970,6 +968,15 @@ msgid "Sending"
 msgstr "Илгээх"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Allowed User Groups"
@@ -985,7 +992,13 @@ msgid "User Information"
 msgstr "Хэрэглэгчийн мэдээлэл"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Үйл ажиллагаа"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1002,9 +1015,9 @@ msgstr ""
 "eg: 2009_SO003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Хавтас"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Date on which Email Sent or Received"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1013,12 +1026,12 @@ msgid "Trash"
 msgstr "Устгасан"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Date on which Email Sent or Received"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Шуудангийн хайрцаг"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1026,13 +1039,13 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Дутуу бүртгэл"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "SMTP Test Connection Was Successful"
@@ -1089,11 +1102,6 @@ msgid "Null Value"
 msgstr "Хоосон утга"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "Шуудангийн хайрцаг"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Загвар"
@@ -1138,7 +1146,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Э-мэйлүүд"
@@ -1226,7 +1233,7 @@ msgid "Model"
 msgstr "Model"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr "Core connection for the given ID does not exist"
@@ -1237,7 +1244,7 @@ msgid "Corporate"
 msgstr "Корпораци"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1266,9 +1273,9 @@ msgid "Mail Format"
 msgstr "Мэйлийн формат"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Үйл ажиллагаа"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Хавтас"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1281,13 +1288,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Enter port number, eg: 25 or 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "email-template"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr "Mail from Account %s failed. Probable Reason:Account not approved"
@@ -1303,8 +1312,8 @@ msgid "Has Attachments"
 msgstr "Has Attachments"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Тайлбаргүй"
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index 62e8588cc2d..a185c68c483 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-01 08:09+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "Email Account Configuratie"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "Emails voor meer items bewaard in Postvak UIT"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -46,19 +47,6 @@ msgstr ""
 "zelf voor een persoonlijke email account."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-"Een email sjabloon is een email document dat wordt verstuurd als onderdeel "
-"van een marketing campagne. U kunt het personaliseren op basis van "
-"specifieke velden zodat hun namen of andere relatie informatie automatisch "
-"kan worden ingevoegd."
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Persoonlijke e-mails"
@@ -106,7 +94,7 @@ msgid "Body"
 msgstr "Berichttekst"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "Record verwijderen is mislukt"
@@ -203,7 +191,7 @@ msgid "Email Account"
 msgstr "Email account"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "Email verzending mislukt voor één of meer objecten"
@@ -317,7 +305,7 @@ msgid "From Email"
 msgstr "Van e-mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -365,7 +353,7 @@ msgid "Subject"
 msgstr "Onderwerp"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Reden: %s"
@@ -382,7 +370,7 @@ msgid "Template"
 msgstr "Sjabloon"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -441,13 +429,13 @@ msgid "Resource"
 msgstr "Resource"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Uitgaande verbindingtest mislukt"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Mail van account %s met succes verstuurd."
@@ -469,7 +457,7 @@ msgid "The text version of the mail"
 msgstr "De tekst-versie van het bericht"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Email Bijlage)"
@@ -519,7 +507,7 @@ msgid "Attach my signature to mail"
 msgstr "Voeg mijn ondertekening toe aan email"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -660,7 +648,7 @@ msgid "Mail Details"
 msgstr "Berichtdetails"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "SMTP SERVER of POORT niet ingevuld"
@@ -788,7 +776,7 @@ msgid "Outgoing"
 msgstr "Uitgaand"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr "Datumtijd extractie mislukt.Datum:%s                       \tFout:%s"
@@ -849,7 +837,7 @@ msgid "Save in Drafts"
 msgstr "Bewaar in Concepten"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -869,10 +857,16 @@ msgid "Language"
 msgstr "Taal"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -902,7 +896,7 @@ msgstr ""
 "Alleen gebruikers van deze groepen mogen mails versturen via dit sjabloon."
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Verstuur mail (%s)"
@@ -950,7 +944,7 @@ msgid "Text, otherwise HTML"
 msgstr "Tekst, anders HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Sjabloon kopie "
@@ -971,7 +965,7 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Fout bij het verzenden van mail: %s"
@@ -987,7 +981,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Berichttekst (HTML-Alleen web-client)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "%s (Email bijlage)"
@@ -998,6 +992,15 @@ msgid "Sending"
 msgstr "Bezig met zenden"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Toegestane gebruikersgroepen"
@@ -1013,7 +1016,13 @@ msgid "User Information"
 msgstr "Gebruikersinformatie"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Acties"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1030,9 +1039,9 @@ msgstr ""
 "gebruikt in de bestandsnaam. bijv: 2009_SO003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Map"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Datum waarop de email is verstuurd of ontvangen"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1041,12 +1050,12 @@ msgid "Trash"
 msgstr "Prullenbak"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Datum waarop de email is verstuurd of ontvangen"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Email postvak"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1057,13 +1066,13 @@ msgstr ""
 "Fout: %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Ontbrekende mail account"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "SMTP Test verbinding was succesvol"
@@ -1120,11 +1129,6 @@ msgid "Null Value"
 msgstr "Nulwaarde"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "Email postvak"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Taal voor sjabloon"
@@ -1170,7 +1174,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Emails"
@@ -1254,7 +1257,7 @@ msgid "Model"
 msgstr "Model"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr "Kernverbinding voor opgegeven ID bestaat niet"
@@ -1265,7 +1268,7 @@ msgid "Corporate"
 msgstr "Bedrijf"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1297,9 +1300,9 @@ msgid "Mail Format"
 msgstr "Mail-indeling"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Acties"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Map"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1312,13 +1315,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Vul poortnummer in, bijv. 25 of 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "email-sjabloon"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1335,8 +1340,8 @@ msgid "Has Attachments"
 msgstr "Heeft bijlagen"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Geen beschrijving"
@@ -1458,3 +1463,14 @@ msgstr "Geen beschrijving"
 
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "De modulenaam moet uniek zijn !"
+
+#~ msgid ""
+#~ "An email template is an email document that will be sent as part of a "
+#~ "marketing campaign. You can personalize it based on specific customer "
+#~ "profile fields so that their names or other partner related information can "
+#~ "be automatically inserted in it."
+#~ msgstr ""
+#~ "Een email sjabloon is een email document dat wordt verstuurd als onderdeel "
+#~ "van een marketing campagne. U kunt het personaliseren op basis van "
+#~ "specifieke velden zodat hun namen of andere relatie informatie automatisch "
+#~ "kan worden ingevoegd."
diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po
index ff363250a37..461b58657af 100644
--- a/addons/email_template/i18n/pl.po
+++ b/addons/email_template/i18n/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-09-29 08:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "Konfiguracja konta pocztowego"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "Wiadomości do wielu elementów zapisane w wychodzących."
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -43,15 +44,6 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr ""
@@ -94,7 +86,7 @@ msgid "Body"
 msgstr "Treść"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "Nie usunięto rekordu"
@@ -184,7 +176,7 @@ msgid "Email Account"
 msgstr "Konto email"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "Nieudane wysłanie jednego lub więcej elementów."
@@ -294,7 +286,7 @@ msgid "From Email"
 msgstr "Adres nadawcy"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -342,7 +334,7 @@ msgid "Subject"
 msgstr "Temat"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Przyczyna: %s"
@@ -359,7 +351,7 @@ msgid "Template"
 msgstr "Szablon"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -416,13 +408,13 @@ msgid "Resource"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Połączenie wychodzące nie działa"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Wiadomość z konta %s wysłana pomyślnie."
@@ -444,7 +436,7 @@ msgid "The text version of the mail"
 msgstr "Tekstowa wersja wiadomości"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Załącznik Email)"
@@ -489,7 +481,7 @@ msgid "Attach my signature to mail"
 msgstr "Dodaj mój podpis do wiadomości"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -624,7 +616,7 @@ msgid "Mail Details"
 msgstr "Szczegóły wiadomości"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "Nie określono SERWERA SMTP lub PORTu"
@@ -750,7 +742,7 @@ msgid "Outgoing"
 msgstr "Wychodząca"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -810,7 +802,7 @@ msgid "Save in Drafts"
 msgstr "Zapisz w projektach"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -828,10 +820,16 @@ msgid "Language"
 msgstr "Język"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -861,7 +859,7 @@ msgstr ""
 "tylko użytkownicy z tej grupy będą mogli wysyłać wiadomości z tego szablonu"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Wyślij wiadomość (%s)"
@@ -908,7 +906,7 @@ msgid "Text, otherwise HTML"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr ""
@@ -929,7 +927,7 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -945,7 +943,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr ""
@@ -956,6 +954,15 @@ msgid "Sending"
 msgstr "Wysyłanie"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Dozwolone grupy użytkowników"
@@ -971,7 +978,13 @@ msgid "User Information"
 msgstr "Informacje o użytkowniku"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Akcje"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -986,9 +999,9 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Katalog"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -997,12 +1010,12 @@ msgid "Trash"
 msgstr "Kosz"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1013,13 +1026,13 @@ msgstr ""
 "Błąd: %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr ""
@@ -1073,11 +1086,6 @@ msgid "Null Value"
 msgstr "Wartości null"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Język szablonu"
@@ -1120,7 +1128,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Wiadomości e-mail"
@@ -1200,7 +1207,7 @@ msgid "Model"
 msgstr "Model"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr ""
@@ -1211,7 +1218,7 @@ msgid "Corporate"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1243,9 +1250,9 @@ msgid "Mail Format"
 msgstr "Format poczty elektr."
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Akcje"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Katalog"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1258,13 +1265,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1280,8 +1289,8 @@ msgid "Has Attachments"
 msgstr "Zawiera załącznik"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Brak opisu"
diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po
index dc44d11cd3b..c9cf77eb4b4 100644
--- a/addons/email_template/i18n/pt.po
+++ b/addons/email_template/i18n/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-20 11:40+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <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: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "Configuração de conta de correio"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -43,15 +44,6 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Mensagens pessoais"
@@ -94,7 +86,7 @@ msgid "Body"
 msgstr "Corpo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "A eliminação do registo falhou"
@@ -187,7 +179,7 @@ msgid "Email Account"
 msgstr "Conta de correio"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr ""
@@ -295,7 +287,7 @@ msgid "From Email"
 msgstr "Remetente"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Aviso"
@@ -342,7 +334,7 @@ msgid "Subject"
 msgstr "Assunto"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr ""
@@ -359,7 +351,7 @@ msgid "Template"
 msgstr "Modelo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -416,13 +408,13 @@ msgid "Resource"
 msgstr "Recurso"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr ""
@@ -444,7 +436,7 @@ msgid "The text version of the mail"
 msgstr "Versão da mensagem, em texto"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr ""
@@ -489,7 +481,7 @@ msgid "Attach my signature to mail"
 msgstr "Anexar assinatura à mensagem"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -623,7 +615,7 @@ msgid "Mail Details"
 msgstr "Detalhes da mensagem"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "Servidor SMTP ou Porto não indicados"
@@ -749,7 +741,7 @@ msgid "Outgoing"
 msgstr "Saíndo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -809,7 +801,7 @@ msgid "Save in Drafts"
 msgstr "Guardar nos rascunhos"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -827,10 +819,16 @@ msgid "Language"
 msgstr "Língua"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -861,7 +859,7 @@ msgstr ""
 "partir deste modelo"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Enviar o correio (%s)"
@@ -908,7 +906,7 @@ msgid "Text, otherwise HTML"
 msgstr "Texto, senão, HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Cópia do modelo "
@@ -929,7 +927,7 @@ msgid "Close"
 msgstr "Fechar"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr "Erro no envio do correio: %s"
@@ -945,7 +943,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr ""
@@ -956,6 +954,15 @@ msgid "Sending"
 msgstr "Enviando"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr ""
@@ -971,7 +978,13 @@ msgid "User Information"
 msgstr "Informação de utilizador"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Ações"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -988,9 +1001,9 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Pasta"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -999,12 +1012,12 @@ msgid "Trash"
 msgstr "Lixeira"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1012,13 +1025,13 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "O teste de ligação ao SMTP correu com êxito"
@@ -1071,11 +1084,6 @@ msgid "Null Value"
 msgstr "Valor nulo"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr ""
@@ -1118,7 +1126,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Mensagens"
@@ -1198,7 +1205,7 @@ msgid "Model"
 msgstr "Modelo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr ""
@@ -1209,7 +1216,7 @@ msgid "Corporate"
 msgstr "Empresarial"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1238,9 +1245,9 @@ msgid "Mail Format"
 msgstr "Formato das mensagens"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Ações"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Pasta"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1253,13 +1260,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1275,8 +1284,8 @@ msgid "Has Attachments"
 msgstr "Existem anexos"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Sem descrição"
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index f37451e8b03..2eacb89ae2c 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-10-18 07:52+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "Настройка Email аккаунта"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "Почта для многократной отправки сохранена в исходящих."
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -43,15 +44,6 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr ""
@@ -94,7 +86,7 @@ msgid "Body"
 msgstr "Тело"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "Ошибка удаления записи"
@@ -184,7 +176,7 @@ msgid "Email Account"
 msgstr "Аккаунт почты"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "Отправка почты не удалась для одного или более объектов."
@@ -294,7 +286,7 @@ msgid "From Email"
 msgstr "Из почты"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Предупреждение"
@@ -338,7 +330,7 @@ msgid "Subject"
 msgstr "Предмет"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Причина: %s"
@@ -355,7 +347,7 @@ msgid "Template"
 msgstr "Шаблон"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -412,13 +404,13 @@ msgid "Resource"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Тест связи потерпел неудачу"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr ""
@@ -440,7 +432,7 @@ msgid "The text version of the mail"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr ""
@@ -485,7 +477,7 @@ msgid "Attach my signature to mail"
 msgstr "Прикрепить подпись к письму"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -619,7 +611,7 @@ msgid "Mail Details"
 msgstr "Сведения о почте"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "Не определен SMTP сервер или порт"
@@ -745,7 +737,7 @@ msgid "Outgoing"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -805,7 +797,7 @@ msgid "Save in Drafts"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -823,10 +815,16 @@ msgid "Language"
 msgstr "Язык"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -855,7 +853,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -902,7 +900,7 @@ msgid "Text, otherwise HTML"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr ""
@@ -923,7 +921,7 @@ msgid "Close"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -939,7 +937,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr ""
@@ -950,6 +948,15 @@ msgid "Sending"
 msgstr "Отправка"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr ""
@@ -965,7 +972,13 @@ msgid "User Information"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -980,8 +993,8 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
 msgstr ""
 
 #. module: email_template
@@ -991,12 +1004,12 @@ msgid "Trash"
 msgstr ""
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1004,13 +1017,13 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr ""
@@ -1064,11 +1077,6 @@ msgid "Null Value"
 msgstr ""
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr ""
@@ -1111,7 +1119,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr ""
@@ -1191,7 +1198,7 @@ msgid "Model"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr ""
@@ -1202,7 +1209,7 @@ msgid "Corporate"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1233,8 +1240,8 @@ msgid "Mail Format"
 msgstr ""
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
 msgstr ""
 
 #. module: email_template
@@ -1248,13 +1255,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1270,8 +1279,8 @@ msgid "Has Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr ""
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index e9d1eeff310..b6b16a38c5f 100644
--- a/addons/email_template/i18n/sr.po
+++ b/addons/email_template/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-11-03 07:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "Email AutoPodesavanja"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "Emailovi za visestruke stavke sacuvane u OutBox-u"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -45,15 +46,6 @@ msgstr ""
 "Ili pitajte administratora ili napravite sami sebi licni postanski nalog."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Licni Emailovi"
@@ -101,7 +93,7 @@ msgid "Body"
 msgstr "Sadrzaj"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "Brisanje zapisa nije uspelo"
@@ -197,7 +189,7 @@ msgid "Email Account"
 msgstr "Email nalog"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "Slanje Emaila je neuspesno zbog jednog ili vise objekata"
@@ -310,7 +302,7 @@ msgid "From Email"
 msgstr "Od Email-a"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -359,7 +351,7 @@ msgid "Subject"
 msgstr "Tema"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Razlog: %s"
@@ -376,7 +368,7 @@ msgid "Template"
 msgstr "Šablon"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -435,13 +427,13 @@ msgid "Resource"
 msgstr "Resurs"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Test izlazne konekcije nije uspeo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Mail od naloga %s je uspesno poslat"
@@ -463,7 +455,7 @@ msgid "The text version of the mail"
 msgstr "Tekstualna verzija poruke"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Email Attachment)"
@@ -513,7 +505,7 @@ msgid "Attach my signature to mail"
 msgstr "Dodaj moj potpis poruci"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -654,7 +646,7 @@ msgid "Mail Details"
 msgstr "Detalji poruke"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "SMTP SERVER ili PORT nije specificiran"
@@ -782,7 +774,7 @@ msgid "Outgoing"
 msgstr "Odlazno"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -842,7 +834,7 @@ msgid "Save in Drafts"
 msgstr "Sacuvaj u Pripremi"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -862,10 +854,16 @@ msgid "Language"
 msgstr "Jezik"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -896,7 +894,7 @@ msgstr ""
 "Sablona"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Slanje POruke (%s)"
@@ -943,7 +941,7 @@ msgid "Text, otherwise HTML"
 msgstr "Text, inace HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Kopija Sablona "
@@ -964,7 +962,7 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -980,7 +978,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Sadrzaj (HTML-Web Client Only)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "Copy text   \t %s (Email Attachment)"
@@ -991,6 +989,15 @@ msgid "Sending"
 msgstr "Слање"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Dozvoljene Korisnicke Grupe"
@@ -1006,7 +1013,13 @@ msgid "User Information"
 msgstr "Podaci o korisniku"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1023,9 +1036,9 @@ msgstr ""
 "koristiti imenu fajla npr: 2009_SO003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Fascikla"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Datum kda je Email poslat ili primljen"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1034,12 +1047,12 @@ msgid "Trash"
 msgstr "Smeće"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Datum kda je Email poslat ili primljen"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Postansko Sanduce"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1050,13 +1063,13 @@ msgstr ""
 "Greska: %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Nedostaje Email nalog"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "SMTP test je prosao uspesno"
@@ -1113,11 +1126,6 @@ msgid "Null Value"
 msgstr "Null вредност"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "Postansko Sanduce"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Jezik Sablona"
@@ -1162,7 +1170,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Email-ovi"
@@ -1249,7 +1256,7 @@ msgid "Model"
 msgstr "Model"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr "Osnovna Konekcija za datu Sifru NE postoji"
@@ -1260,7 +1267,7 @@ msgid "Corporate"
 msgstr "Saradjivanje"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1292,9 +1299,9 @@ msgid "Mail Format"
 msgstr "Format Poruke"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Akcije"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Fascikla"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1307,13 +1314,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Upisi broj porta, npr 25 ili 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "sablon-poruke"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr "Poruka sa naloga %s nije uspela. Moguci razlog: Nalog nije omogucen"
@@ -1329,8 +1338,8 @@ msgid "Has Attachments"
 msgstr "Ima Attachment"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Bez Opisa"
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
index fec9123fd96..a0f8b2b0747 100644
--- a/addons/email_template/i18n/sr@latin.po
+++ b/addons/email_template/i18n/sr@latin.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-24 13:27+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "Email AutoPodesavanja"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr "Emailovi za visestruke stavke sacuvane u OutBox-u"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -45,15 +46,6 @@ msgstr ""
 "Ili pitajte administratora ili napravite sami sebi licni postanski nalog."
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr "Licni Emailovi"
@@ -101,7 +93,7 @@ msgid "Body"
 msgstr "Sadrzaj"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr "Brisanje zapisa nije uspelo"
@@ -197,7 +189,7 @@ msgid "Email Account"
 msgstr "Email nalog"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr "Slanje Emaila je neuspesno zbog jednog ili vise objekata"
@@ -310,7 +302,7 @@ msgid "From Email"
 msgstr "Od Email-a"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -359,7 +351,7 @@ msgid "Subject"
 msgstr "Tema"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Razlog: %s"
@@ -376,7 +368,7 @@ msgid "Template"
 msgstr "Šablon"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -435,13 +427,13 @@ msgid "Resource"
 msgstr "Resurs"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr "Test izlazne konekcije nije uspeo"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr "Mail od naloga %s je uspesno poslat"
@@ -463,7 +455,7 @@ msgid "The text version of the mail"
 msgstr "Tekstualna verzija poruke"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr " (Email Attachment)"
@@ -513,7 +505,7 @@ msgid "Attach my signature to mail"
 msgstr "Dodaj moj potpis poruci"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -654,7 +646,7 @@ msgid "Mail Details"
 msgstr "Detalji poruke"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr "SMTP SERVER ili PORT nije specificiran"
@@ -782,7 +774,7 @@ msgid "Outgoing"
 msgstr "Odlazno"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -842,7 +834,7 @@ msgid "Save in Drafts"
 msgstr "Sacuvaj u Pripremi"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -862,10 +854,16 @@ msgid "Language"
 msgstr "Jezik"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -896,7 +894,7 @@ msgstr ""
 "Sablona"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Slanje POruke (%s)"
@@ -943,7 +941,7 @@ msgid "Text, otherwise HTML"
 msgstr "Text, inace HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr "Kopija Sablona "
@@ -964,7 +962,7 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -980,7 +978,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr "Sadrzaj (HTML-Web Client Only)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "Copy text   \t %s (Email Attachment)"
@@ -991,6 +989,15 @@ msgid "Sending"
 msgstr "Слање"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Dozvoljene Korisnicke Grupe"
@@ -1006,7 +1013,13 @@ msgid "User Information"
 msgstr "Podaci o korisniku"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -1023,9 +1036,9 @@ msgstr ""
 "koristiti imenu fajla npr: 2009_SO003.pdf"
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
-msgstr "Fascikla"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Datum kda je Email poslat ili primljen"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1034,12 +1047,12 @@ msgid "Trash"
 msgstr "Smeće"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
-msgstr "Datum kda je Email poslat ili primljen"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Postansko Sanduce"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1050,13 +1063,13 @@ msgstr ""
 "Greska: %s"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Nedostaje Email nalog"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr "SMTP test je prosao uspesno"
@@ -1113,11 +1126,6 @@ msgid "Null Value"
 msgstr "Null вредност"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr "Postansko Sanduce"
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr "Jezik Sablona"
@@ -1162,7 +1170,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "Email-ovi"
@@ -1249,7 +1256,7 @@ msgid "Model"
 msgstr "Model"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr "Osnovna Konekcija za datu Sifru NE postoji"
@@ -1260,7 +1267,7 @@ msgid "Corporate"
 msgstr "Saradjivanje"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1292,9 +1299,9 @@ msgid "Mail Format"
 msgstr "Format Poruke"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr "Akcije"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Fascikla"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1307,13 +1314,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr "Upisi broj porta, npr 25 ili 587"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr "sablon-poruke"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr "Poruka sa naloga %s nije uspela. Moguci razlog: Nalog nije omogucen"
@@ -1329,8 +1338,8 @@ msgid "Has Attachments"
 msgstr "Ima Attachment"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr "Bez Opisa"
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 1ec7ae6c576..b9ef8f77329 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57+0000\n"
 "PO-Revision-Date: 2010-12-15 11:06+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -28,13 +28,14 @@ msgid "Email Account Configuration"
 msgstr "E-post kontokonfigurering"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid ""
 "No personal email accounts are configured for you. \n"
@@ -43,15 +44,6 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid ""
-"An email template is an email document that will be sent as part of a "
-"marketing campaign. You can personalize it based on specific customer "
-"profile fields so that their names or other partner related information can "
-"be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
 msgstr ""
@@ -94,7 +86,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr ""
@@ -182,7 +174,7 @@ msgid "Email Account"
 msgstr "E-post konto"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr ""
@@ -292,7 +284,7 @@ msgid "From Email"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr "Varning"
@@ -336,7 +328,7 @@ msgid "Subject"
 msgstr "Rubrik"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr "Orsak: %s"
@@ -353,7 +345,7 @@ msgid "Template"
 msgstr "Mall"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
@@ -410,13 +402,13 @@ msgid "Resource"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr ""
@@ -438,7 +430,7 @@ msgid "The text version of the mail"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr ""
@@ -483,7 +475,7 @@ msgid "Attach my signature to mail"
 msgstr "Bifoga signatur till e-post"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -617,7 +609,7 @@ msgid "Mail Details"
 msgstr "E-post detaljer"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr ""
@@ -743,7 +735,7 @@ msgid "Outgoing"
 msgstr "Utgående"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
@@ -803,7 +795,7 @@ msgid "Save in Drafts"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
@@ -821,10 +813,16 @@ msgid "Language"
 msgstr "Språk"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -853,7 +851,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr "Skicka e-post (%s)"
@@ -900,7 +898,7 @@ msgid "Text, otherwise HTML"
 msgstr "Text, annars HTML"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr ""
@@ -921,7 +919,7 @@ msgid "Close"
 msgstr "Stäng"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -937,7 +935,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr ""
@@ -948,6 +946,15 @@ msgid "Sending"
 msgstr "Skickar"
 
 #. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr ""
@@ -963,7 +970,13 @@ msgid "User Information"
 msgstr "Användarinformation"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid ""
 "Server Send Error\n"
@@ -978,8 +991,8 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
 msgstr ""
 
 #. module: email_template
@@ -989,12 +1002,12 @@ msgid "Trash"
 msgstr "Papperskorg"
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -1002,13 +1015,13 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr "Saknar e-post konto"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr ""
@@ -1060,11 +1073,6 @@ msgid "Null Value"
 msgstr ""
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
-
-#. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
 msgstr ""
@@ -1107,7 +1115,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr "E-post"
@@ -1187,7 +1194,7 @@ msgid "Model"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr ""
@@ -1198,7 +1205,7 @@ msgid "Corporate"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid ""
 "Mail from Account %s failed on login. Probable Reason:Could not login to "
@@ -1227,8 +1234,8 @@ msgid "Mail Format"
 msgstr ""
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
 msgstr ""
 
 #. module: email_template
@@ -1242,13 +1249,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1264,8 +1273,8 @@ msgid "Has Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr ""