[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q

11 files changed, 1988 insertions, 526 deletions

diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index d5f5e9776d3..b6264516f43 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -26,7 +26,7 @@
     "author" : "Openlabs",
     "website" : "http://openerp.com",
     "category" : "Added functionality",
-    "depends" : ['marketing'],
+    "depends" : ['marketing', 'base_tools'],
     "description": """
     Email Template is extraction of Power Email basically just to send the emails.
     """,
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 836fe5b77e4..eee1a13bb70 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -23,10 +23,9 @@
 import base64
 import random
 import netsvc
+import logging
 import re
 
-LOGGER = netsvc.Logger()
-
 TEMPLATE_ENGINES = []
 
 from osv import osv, fields
@@ -35,12 +34,9 @@ from tools.translate import _
 try:
     from mako.template import Template as MakoTemplate
     TEMPLATE_ENGINES.append(('mako', 'Mako Templates'))
-except:
-    LOGGER.notifyChannel(
-         _("Email Template"),
-         netsvc.LOG_WARNING,
-         _("Mako templates not installed")
-    )
+except ImportError:
+    logging.getLogger('init').warning("module email_template: Mako templates not installed")
+    
 try:
     from django.template import Context, Template as DjangoTemplate
     #Workaround for bug:
@@ -49,12 +45,8 @@ try:
     settings.configure()
     #Workaround ends
     TEMPLATE_ENGINES.append(('django', 'Django Template'))
-except:
-    LOGGER.notifyChannel(
-         _("Email Template"),
-         netsvc.LOG_WARNING,
-         _("Django templates not installed")
-    )
+except ImportError:
+    logging.getLogger('init').warning("module email_template: Django templates not installed")
 
 import tools
 import pooler
@@ -267,7 +259,7 @@ This is useful for CRM leads for example"),
     }
 
     _sql_constraints = [
-        ('name', 'unique (name)', _('The template name must be unique !'))
+        ('name', 'unique (name)','The template name must be unique !')
     ]
 
     def create_action(self, cr, uid, ids, context=None):
@@ -733,7 +725,7 @@ class email_template_preview(osv.osv_memory):
             ref_obj_id = self.pool.get('email.template').read(cr, uid, context['template_id'], ['object_name'], context)
             ref_obj_name = self.pool.get('ir.model').read(cr, uid, ref_obj_id['object_name'][0], ['model'], context)['model']
             model_obj = self.pool.get(ref_obj_name)
-            ref_obj_ids = model_obj.search(cr, uid, [], 0, 20, 'id desc', context=context)
+            ref_obj_ids = model_obj.search(cr, uid, [], 0, 20, 'id', context=context)
             if not ref_obj_ids:
                 ref_obj_ids = []
 
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 40ea0fd53c1..462baa1672d 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -360,19 +360,19 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
                             payload_part.attach(part)
                 except Exception, error:
                     logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:MIME Error\nDescription: %s") % (id, error))
-                    return {'error_msg': "Server Send Error\nDescription: %s"%error}
+                    return {'error_msg': _("Server Send Error\nDescription: %s")%error}
                 try:
                     serv.sendmail(payload_part['From'], addresses_l['all-recipients'], payload_part.as_string())
                 except Exception, error:
-                    logging.getLogger('email_template').error("Mail from Account %s failed. Probable Reason: Server Send Error\n Description: %s", id, error, exc_info=True)
-                    return {'error_msg': "Server Send Error\nDescription: %s"%error}
+                    logging.getLogger('email_template').error(_("Mail from Account %s failed. Probable Reason: Server Send Error\n Description: %s"), id, error, exc_info=True)
+                    return {'error_msg': _("Server Send Error\nDescription: %s")%error}
                 #The mail sending is complete
                 serv.close()
                 logger.notifyChannel(_("Email Template"), netsvc.LOG_INFO, _("Mail from Account %s successfully Sent.") % (id))
                 return True
             else:
                 logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
-                return {'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id}
+                return {'nodestroy':True,'error_msg': _("Mail from Account %s failed. Probable Reason:Account not approved")% id}
 
     def extracttime(self, time_as_string):
         """
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 97108cb9e33..00429efc16c 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
-            groups="marketing.group_marketing_user"/>
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
         <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
@@ -107,10 +107,6 @@
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
 
-        <!-- Email Template account menu in Tools -->
-
-        <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-
         <menuitem name="Configuration" parent="base.menu_tools"
               id="base.menu_lunch_survey_root" sequence="20" />
 
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 6b222a66279..3da2b114fcb 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-08 08:25+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"PO-Revision-Date: 2010-11-30 17:14+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.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-11-09 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -33,6 +34,31 @@ 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
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"Keine eigenes EMailkonto ist für Sie definiert.\n"
+"Entweder erfragen Sie ein Konto für dieses Template bei Ihrem Administrator "
+"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"
@@ -58,16 +84,18 @@ msgid "Plain Text & HTML with no attachments"
 msgstr "Klartext & HTML ohne Anhänge"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
+#: help:email.template,model_object_field:0
 msgid ""
-"Mail from Account %s failed on login. Probable Reason:Could not login to "
-"server\n"
-"Error: %s"
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
 msgstr ""
-"Fehler bei Anmeldung mit EMailkonto  %s . Eventuelle Ursache: Login an "
-"Server nicht möglich\n"
-"Fehler: %s"
+"Wähle das Feld des Moduls welches genutzt werden soll.\n"
+"Falls dieses Datenfeld ein Feld mit Verknüpfung ist, können zu "
+"referenzierende Werte in der Box unten gewählt werden \n"
+"(Hinweis: Sollten Sie keine Werte sehen können, stellen Sie sicher, dass Sie "
+"das richtige Modul gewählt haben.)"
 
 #. module: email_template
 #: field:email_template.preview,body_html:0
@@ -115,6 +143,15 @@ msgid "Send all mails"
 msgstr "Sende alle EMails"
 
 #. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Spezifizieren Sie den Benutzernamen wenn Ihr SMTP Server diese "
+"Authentifizier benötigt, alternativ tragen Sie nichts ein."
+
+#. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
 msgstr "Server Referenz der Mail"
@@ -161,6 +198,12 @@ msgstr ""
 "verwendet, es sei denn, es ist bereits in der E-Mail versendet worden."
 
 #. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "An"
+
+#. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
 msgstr "EMail Konto"
@@ -418,6 +461,11 @@ msgid "Mail from Account %s successfully Sent."
 msgstr "EMail von Konto %s erfolgreich versendet."
 
 #. module: email_template
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
 msgstr "Mako Vorlagen"
@@ -434,17 +482,6 @@ msgid "Sent Items"
 msgstr "Versendete EMails"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid ""
-"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
-"Error: %s"
-msgstr ""
-"Versand der EMail %s ist fehlgeschlagen. Möglicher Grund: Kein Server Login "
-"möglich\n"
-"Fehler: %s"
-
-#. module: email_template
 #: view:email_template.account:0
 msgid "Test Outgoing Connection"
 msgstr "Test Ausgehende Verbindung"
@@ -498,18 +535,9 @@ msgid "Template"
 msgstr "Vorlage"
 
 #. module: email_template
-#: help:email.template,model_object_field:0
-msgid ""
-"Select the field from the model you want to use.\n"
-"If it is a relationship field you will be able to choose the nested values "
-"in the box below\n"
-"(Note:If there are no values make sure you have selected the correct model)"
-msgstr ""
-"Wähle das Feld des Moduls welches genutzt werden soll.\n"
-"Falls dieses Datenfeld ein Feld mit Verknüpfung ist, können zu "
-"referenzierende Werte in der Box unten gewählt werden \n"
-"(Hinweis: Sollten Sie keine Werte sehen können, stellen Sie sicher, dass Sie "
-"das richtige Modul gewählt haben.)"
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Sub Feld"
 
 #. module: email_template
 #: view:email.template:0
@@ -613,6 +641,11 @@ msgid "Rec/Sent Date"
 msgstr "Empfang /Sende Datum"
 
 #. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Initialisiert"
+
+#. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
 msgstr "Zu versend. Anhang"
@@ -674,15 +707,6 @@ msgid "Window Action"
 msgstr "Fenster Aktion"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-msgstr ""
-"Extraktion Datum/Zeit fehlgeschlagen.Datum:%s \\n                      \t"
-"Fehler:%s"
-
-#. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
 msgstr "HTML, alternativ Text"
@@ -776,9 +800,10 @@ msgid "Outgoing"
 msgstr "Postausgang"
 
 #. module: email_template
-#: selection:email_template.account,state:0
-msgid "Initiated"
-msgstr "Initialisiert"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr "Datumzeit Extraktion fehlgeschlagen.Datum:%s \tFehler:%s"
 
 #. module: email_template
 #: help:email.template,use_sign:0
@@ -814,11 +839,6 @@ msgid "User Name"
 msgstr "Benutzer Name"
 
 #. module: email_template
-#: field:email.template,sub_model_object_field:0
-msgid "Sub Field"
-msgstr "Sub Feld"
-
-#. module: email_template
 #: help:email.template,attachment_ids:0
 msgid ""
 "You may attach existing files to this template, so they will be added in all "
@@ -849,6 +869,16 @@ msgid "Save in Drafts"
 msgstr "Speichern als Entwurf"
 
 #. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"Mail von Konto %s ist fehlgeschlagen. Mögliche Ursache:MIME Fehler\n"
+"Beschreibung:%s"
+
+#. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
 msgstr "TLS"
@@ -861,7 +891,6 @@ msgstr "Sprache"
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/email_template_mailbox.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
@@ -882,28 +911,6 @@ msgid "Send Mail"
 msgstr "Sende EMail"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid ""
-"Error sending mail: %s\" % str(e)))\n"
-"        \n"
-"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-"        if ids is None:\n"
-"            ids = []\n"
-"        if context is None:\n"
-"            context = {}\n"
-"        filters = [('folder', '=', 'outbox"
-msgstr ""
-"Fehler bei Mailversand: %s\" % str(e)))\n"
-"        \n"
-"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-"        if ids is None:\n"
-"            ids = []\n"
-"        if context is None:\n"
-"            context = {}\n"
-"        filters = [('folder', '=', 'outbox"
-
-#. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
 "Only users from these groups will be allowed to send mails from this Template"
@@ -954,10 +961,9 @@ msgid "Attachments"
 msgstr "Anhänge"
 
 #. module: email_template
-#: field:email_template.preview,to:0
-#: field:email_template.send.wizard,to:0
-msgid "To"
-msgstr "An"
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "Die Modulbezeichnung sollte eindeutig sein !"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
@@ -986,6 +992,17 @@ msgid "Close"
 msgstr "Beenden"
 
 #. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid "Error sending mail: %s"
+msgstr "Fehler beim Senden der E-Mail: %s"
+
+#. module: email_template
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
 msgstr "Haupttext (HTML - Nur Web-Client)"
@@ -1005,18 +1022,6 @@ msgid "%s (Email Attachment)"
 msgstr "%s (Email Anhang)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
-#, python-format
-msgid ""
-"No personal email accounts are configured for you. \n"
-"Either ask admin to enforce an account for this template or get yourself a "
-"personal email account."
-msgstr ""
-"Keine eigenes EMailkonto ist für Sie definiert.\n"
-"Entweder erfragen Sie ein Konto für dieses Template bei Ihrem Administrator "
-"oder beantragen ein persönliches Mailkonto für die Versendung."
-
-#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Berechtigte Benutzer Gruppe"
@@ -1032,6 +1037,11 @@ msgid "User Information"
 msgstr "Benutzer Information"
 
 #. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Aktionen"
+
+#. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
@@ -1047,9 +1057,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
@@ -1058,18 +1068,20 @@ 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
-#: help:email_template.account,smtpuname:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
 msgid ""
-"Specify the username if your SMTP server requires authentication, otherwise "
-"leave it empty."
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
 msgstr ""
-"Spezifizieren Sie den Benutzernamen wenn Ihr SMTP Server diese "
-"Authentifizier benötigt, alternativ tragen Sie nichts ein."
+"Versand der EMail %s ist fehlgeschlagen. Möglicher Grund: Kein Server Login "
+"möglich\n"
+"Fehler: %s"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
@@ -1134,11 +1146,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"
@@ -1271,6 +1278,18 @@ msgid "Corporate"
 msgstr "Gesellschaft"
 
 #. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"Fehler bei Anmeldung mit EMailkonto  %s . Eventuelle Ursache: Login an "
+"Server nicht möglich\n"
+"Fehler: %s"
+
+#. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
 msgstr "Assistent für den Versand der EMail"
@@ -1286,24 +1305,14 @@ msgid "Emails will be sent from this approved account."
 msgstr "EMails werden von genehmigtem Konto versendet"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Mail from Account %s failed. Probable Reason:MIME Error\n"
-"Description: %s"
-msgstr ""
-"Mail von Konto %s ist fehlgeschlagen. Mögliche Ursache:MIME Fehler\n"
-"Beschreibung:%s"
-
-#. module: email_template
 #: field:email_template.account,send_pref:0
 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
@@ -1345,3 +1354,30 @@ msgstr "Hat Dateianhang"
 #, python-format
 msgid "No Description"
 msgstr "Keine Beschreibung"
+
+#, python-format
+#~ msgid ""
+#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
+#~ msgstr ""
+#~ "Extraktion Datum/Zeit fehlgeschlagen.Datum:%s \\n                      \t"
+#~ "Fehler:%s"
+
+#, python-format
+#~ msgid ""
+#~ "Error sending mail: %s\" % str(e)))\n"
+#~ "        \n"
+#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+#~ "        if ids is None:\n"
+#~ "            ids = []\n"
+#~ "        if context is None:\n"
+#~ "            context = {}\n"
+#~ "        filters = [('folder', '=', 'outbox"
+#~ msgstr ""
+#~ "Fehler bei Mailversand: %s\" % str(e)))\n"
+#~ "        \n"
+#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+#~ "        if ids is None:\n"
+#~ "            ids = []\n"
+#~ "        if context is None:\n"
+#~ "            context = {}\n"
+#~ "        filters = [('folder', '=', 'outbox"
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 1be84d2c577..f23ab1895fe 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12:02+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:02+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43:31+0000\n"
+"PO-Revision-Date: 2010-12-03 15:43:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -49,8 +49,8 @@ msgid "Personal Emails"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: field:email.template,file_name:0
+msgid "Report Filename"
 msgstr ""
 
 #. module: email_template
@@ -127,12 +127,6 @@ msgid "Server Reference of mail"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Reason: %s"
-msgstr ""
-
-#. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Approved"
@@ -159,12 +153,6 @@ msgid "The description is used as the Sender name along with the provided From E
 msgstr ""
 
 #. module: email_template
-#: field:email_template.preview,to:0
-#: field:email_template.send.wizard,to:0
-msgid "To"
-msgstr ""
-
-#. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
 msgstr ""
@@ -245,12 +233,6 @@ msgid "Both HTML & Text (Alternative)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
-msgid "Mako templates not installed"
-msgstr ""
-
-#. module: email_template
 #: field:email_template.send.wizard,requested:0
 msgid "No of requested Mails"
 msgstr ""
@@ -318,8 +300,9 @@ msgid "Subject"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.mailbox:0
-msgid "My Emails"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
 msgstr ""
 
 #. module: email_template
@@ -328,13 +311,16 @@ msgid "From"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,file_name:0
-msgid "Report Filename"
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
 msgstr ""
 
 #. module: email_template
-#: selection:email_template.mailbox,state:0
-msgid "Sending"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
 msgstr ""
 
 #. module: email_template
@@ -397,11 +383,6 @@ msgid "Mail from Account %s successfully Sent."
 msgstr ""
 
 #. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
 msgstr ""
@@ -456,12 +437,6 @@ msgid "Report"
 msgstr ""
 
 #. module: email_template
-#: field:email_template.preview,ref_template:0
-#: field:email_template.send.wizard,ref_template:0
-msgid "Template"
-msgstr ""
-
-#. module: email_template
 #: field:email.template,sub_model_object_field:0
 msgid "Sub Field"
 msgstr ""
@@ -473,8 +448,8 @@ msgid "Advanced"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
+#: view:email_template.mailbox:0
+msgid "My Emails"
 msgstr ""
 
 #. module: email_template
@@ -483,8 +458,8 @@ msgid "Expression Builder"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: help:email.template,sub_object:0
+msgid "When a relation field is used this field will show you the type of field you have selected"
 msgstr ""
 
 #. module: email_template
@@ -650,8 +625,7 @@ msgid "Mail Contents"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
+#: sql_constraint:email.template:0
 msgid "The template name must be unique !"
 msgstr ""
 
@@ -674,11 +648,6 @@ msgid "Draft"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
 msgstr ""
@@ -752,11 +721,6 @@ msgid "User Name"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,attachment_ids:0
-msgid "You may attach existing files to this template, so they will be added in all emails created from this template"
-msgstr ""
-
-#. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
 msgstr ""
@@ -795,7 +759,6 @@ msgid "Language"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/email_template_account.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
@@ -817,6 +780,12 @@ msgid "Send Mail"
 msgstr ""
 
 #. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
 #: help:email.template,allowed_groups:0
 msgid "Only users from these groups will be allowed to send mails from this Template"
 msgstr ""
@@ -849,12 +818,6 @@ msgid "History"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
-msgid "Django templates not installed"
-msgstr ""
-
-#. module: email_template
 #: view:email.template:0
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,attachments_ids:0
@@ -864,8 +827,9 @@ msgid "Attachments"
 msgstr ""
 
 #. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
 msgstr ""
 
 #. module: email_template
@@ -901,8 +865,8 @@ msgid "Error sending mail: %s"
 msgstr ""
 
 #. module: email_template
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
 msgstr ""
 
 #. module: email_template
@@ -911,17 +875,17 @@ msgid "Body (HTML-Web Client Only)"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr ""
 
 #. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr ""
@@ -942,9 +906,10 @@ msgid "Actions"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.account:0
-#: selection:email_template.account,state:0
-msgid "Suspended"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Server Send Error\n"
+"Description: %s"
 msgstr ""
 
 #. module: email_template
@@ -1008,8 +973,8 @@ msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,sub_object:0
-msgid "When a relation field is used this field will show you the type of field you have selected"
+#: help:email.template,attachment_ids:0
+msgid "You may attach existing files to this template, so they will be added in all emails created from this template"
 msgstr ""
 
 #. module: email_template
@@ -1047,6 +1012,11 @@ msgid "Sent"
 msgstr ""
 
 #. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
 #: help:email.template,ref_ir_act_window:0
 msgid "Action that will open this email template on Resource records"
 msgstr ""
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index 1c6cb9883e4..a0acb481fd7 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-24 13:25+0000\n"
+"PO-Revision-Date: 2010-11-29 07:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@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-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-11-30 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -931,7 +931,7 @@ msgstr "Plantillas Django no instaladas"
 #: view:email_template.send.wizard:0
 #: field:email_template.send.wizard,attachment_ids:0
 msgid "Attachments"
-msgstr "Documentos adjuntos"
+msgstr "Adjuntos"
 
 #. module: email_template
 #: sql_constraint:ir.module.module:0
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index 5e9bc6de42a..83691c08cb3 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -6,46 +6,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-04 08:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Supprimer déinitivement les courriels après envoi"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Email Account Configuration"
-msgstr ""
+msgstr "Configuration du compte de courriel"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, 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
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+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 ""
+msgstr "Courriels personnels"
 
 #. module: email_template
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: field:email.template,file_name:0
+msgid "Report Filename"
 msgstr ""
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content  "
-msgstr ""
+msgstr "Contenu du courriel  "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -58,12 +76,12 @@ msgid "Plain Text & HTML with no attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
+#: help:email.template,model_object_field:0
 msgid ""
-"Mail from Account %s failed on login. Probable Reason:Could not login to "
-"server\n"
-"Error: %s"
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
 msgstr ""
 
 #. module: email_template
@@ -72,13 +90,13 @@ msgstr ""
 #: field:email_template.send.wizard,body_html:0
 #: field:email_template.send.wizard,body_text:0
 msgid "Body"
-msgstr ""
+msgstr "Corps"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Deletion of Record failed"
-msgstr ""
+msgstr "La suppression de l'enregistrement a échoué"
 
 #. module: email_template
 #: help:email_template.account,company:0
@@ -90,7 +108,7 @@ msgstr ""
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send now"
-msgstr ""
+msgstr "Envoyer maintenant"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
@@ -102,29 +120,30 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
 #: model:ir.ui.menu,name:email_template.menu_email_template_account_all
 msgid "Email Accounts"
-msgstr ""
+msgstr "Compte de courriel"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send all mails"
-msgstr ""
+msgstr "Envoyer tous les courriels"
 
 #. module: email_template
-#: field:email_template.mailbox,server_ref:0
-msgid "Server Reference of mail"
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Reason: %s"
-msgstr ""
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Référence serveur du courriel"
 
 #. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Approuvé"
 
 #. module: email_template
 #: help:email.template,def_cc:0
@@ -136,12 +155,12 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #. module: email_template
 #: field:email.template,table_html:0
 msgid "HTML code"
-msgstr ""
+msgstr "Code HTML"
 
 #. module: email_template
 #: help:email_template.account,name:0
@@ -154,7 +173,7 @@ msgstr ""
 #. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
-msgstr ""
+msgstr "Compte de courriel"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
@@ -168,6 +187,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Ajouter ici toutes les pièces jointes du document actuel que vous souhaitez "
+"joindre au courriel."
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -186,7 +207,7 @@ msgstr ""
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Wizard Complete"
-msgstr ""
+msgstr "Assistant terminé"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -194,28 +215,28 @@ msgstr ""
 #: field:email_template.preview,reply_to:0
 #: field:email_template.send.wizard,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Répondre à"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Delete Action"
-msgstr ""
+msgstr "Supprimer l'action"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Approve Account"
-msgstr ""
+msgstr "Approuver le compte"
 
 #. module: email_template
 #: field:email_template.preview,rel_model_ref:0
 #: field:email_template.send.wizard,rel_model_ref:0
 msgid "Referred Document"
-msgstr ""
+msgstr "Document en référence"
 
 #. module: email_template
 #: field:email_template.send.wizard,full_success:0
 msgid "Complete Success"
-msgstr ""
+msgstr "Succès complet"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
@@ -225,7 +246,7 @@ msgstr ""
 #. module: email_template
 #: view:email_template.preview:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: email_template
 #: field:email_template.account,auto_delete:0
@@ -238,12 +259,6 @@ msgid "Both HTML & Text (Alternative)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
-msgid "Mako templates not installed"
-msgstr ""
-
-#. module: email_template
 #: field:email_template.send.wizard,requested:0
 msgid "No of requested Mails"
 msgstr ""
@@ -258,28 +273,28 @@ msgstr ""
 #. module: email_template
 #: field:email.template,attachment_ids:0
 msgid "Attached Files"
-msgstr ""
+msgstr "Fichiers joints"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Standard Body"
-msgstr ""
+msgstr "Corps de message standard"
 
 #. module: email_template
 #: field:email_template.account,email_id:0
 msgid "From Email"
-msgstr ""
+msgstr "Courriel de l'expéditeur"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Attention"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
 msgid "Accounts"
-msgstr ""
+msgstr "Comptes"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -289,7 +304,7 @@ msgstr ""
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Company Emails"
-msgstr ""
+msgstr "Courriels de la société"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -315,34 +330,39 @@ msgid "Subject"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.mailbox:0
-msgid "My Emails"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
 msgstr ""
 
 #. module: email_template
 #: field:email_template.mailbox,email_from:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: email_template
-#: field:email.template,file_name:0
-msgid "Report Filename"
-msgstr ""
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Modèle"
 
 #. module: email_template
-#: selection:email_template.mailbox,state:0
-msgid "Sending"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
 msgstr ""
 
 #. module: email_template
 #: view:email.template:0
 msgid "Insert Simple Field"
-msgstr ""
+msgstr "Insérer un champ simple"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Html)"
-msgstr ""
+msgstr "Corps (HTML)"
 
 #. module: email_template
 #: help:email.template,def_bcc:0
@@ -354,7 +374,7 @@ msgstr ""
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
-msgstr ""
+msgstr "Aperçu du modèle"
 
 #. module: email_template
 #: field:email.template,def_body_html:0
@@ -365,7 +385,7 @@ msgstr ""
 #: field:email_template.account,state:0
 #: view:email_template.mailbox:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
@@ -381,7 +401,7 @@ msgstr ""
 #: view:email.template:0
 #: field:email.template,object_name:0
 msgid "Resource"
-msgstr ""
+msgstr "Ressource"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -393,7 +413,7 @@ msgstr ""
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Mail from Account %s successfully Sent."
-msgstr ""
+msgstr "Courriel du compte %s envoyé avec succès."
 
 #. module: email_template
 #: selection:email.template,template_language:0
@@ -409,15 +429,7 @@ msgstr ""
 #. module: email_template
 #: selection:email_template.mailbox,folder:0
 msgid "Sent Items"
-msgstr ""
-
-#. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid ""
-"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
-"Error: %s"
-msgstr ""
+msgstr "Éléments envoyés"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -428,7 +440,7 @@ msgstr ""
 #: help:email.template,def_body_html:0
 #: help:email.template,def_body_text:0
 msgid "The text version of the mail"
-msgstr ""
+msgstr "La version texte du courriel"
 
 #. module: email_template
 #: help:email.template,reply_to:0
@@ -447,7 +459,7 @@ msgstr ""
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
 msgid "User account"
-msgstr ""
+msgstr "Compte de l'utilisateur"
 
 #. module: email_template
 #: field:email_template.send.wizard,signature:0
@@ -459,21 +471,11 @@ msgstr ""
 #: view:email.template:0
 #, python-format
 msgid "Report"
-msgstr ""
-
-#. module: email_template
-#: field:email_template.preview,ref_template:0
-#: field:email_template.send.wizard,ref_template:0
-msgid "Template"
-msgstr ""
+msgstr "Rapport"
 
 #. module: email_template
-#: help:email.template,model_object_field:0
-msgid ""
-"Select the field from the model you want to use.\n"
-"If it is a relationship field you will be able to choose the nested values "
-"in the box below\n"
-"(Note:If there are no values make sure you have selected the correct model)"
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
 msgstr ""
 
 #. module: email_template
@@ -483,9 +485,9 @@ msgid "Advanced"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Mes courriels"
 
 #. module: email_template
 #: view:email.template:0
@@ -493,24 +495,26 @@ msgid "Expression Builder"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
 msgstr ""
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "HTML Body"
-msgstr ""
+msgstr "Corps HTML"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Suspend Account"
-msgstr ""
+msgstr "Suspendre le compte"
 
 #. module: email_template
 #: help:email.template,null_value:0
 msgid "This Value is used if the field is empty"
-msgstr ""
+msgstr "Cette valeur est utilisée si le champ est vide"
 
 #. module: email_template
 #: view:email.template:0
@@ -520,7 +524,7 @@ msgstr ""
 #. module: email_template
 #: field:email_template.account,smtpserver:0
 msgid "Server"
-msgstr ""
+msgstr "Serveur"
 
 #. module: email_template
 #: help:email.template,copyvalue:0
@@ -572,6 +576,11 @@ msgid "Rec/Sent Date"
 msgstr ""
 
 #. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
 msgstr ""
@@ -633,13 +642,6 @@ msgid "Window Action"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-msgstr ""
-
-#. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
 msgstr ""
@@ -666,8 +668,7 @@ msgid "Mail Contents"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
+#: sql_constraint:email.template:0
 msgid "The template name must be unique !"
 msgstr ""
 
@@ -690,11 +691,6 @@ msgid "Draft"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
 msgstr ""
@@ -731,8 +727,9 @@ msgid "Outgoing"
 msgstr ""
 
 #. module: email_template
-#: selection:email_template.account,state:0
-msgid "Initiated"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
 
 #. module: email_template
@@ -769,18 +766,6 @@ msgid "User Name"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,sub_model_object_field:0
-msgid "Sub Field"
-msgstr ""
-
-#. module: email_template
-#: help:email.template,attachment_ids:0
-msgid ""
-"You may attach existing files to this template, so they will be added in all "
-"emails created from this template"
-msgstr ""
-
-#. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
 msgstr ""
@@ -802,6 +787,14 @@ msgid "Save in Drafts"
 msgstr ""
 
 #. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
 msgstr ""
@@ -812,9 +805,7 @@ msgid "Language"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/email_template_mailbox.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
@@ -835,17 +826,9 @@ msgid "Send Mail"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid ""
-"Error sending mail: %s\" % str(e)))\n"
-"        \n"
-"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-"        if ids is None:\n"
-"            ids = []\n"
-"        if context is None:\n"
-"            context = {}\n"
-"        filters = [('folder', '=', 'outbox"
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
 msgstr ""
 
 #. module: email_template
@@ -882,12 +865,6 @@ msgid "History"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
-msgid "Django templates not installed"
-msgstr ""
-
-#. module: email_template
 #: view:email.template:0
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,attachments_ids:0
@@ -900,7 +877,7 @@ msgstr ""
 #: field:email_template.preview,to:0
 #: field:email_template.send.wizard,to:0
 msgid "To"
-msgstr ""
+msgstr "À"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
@@ -929,14 +906,19 @@ msgid "Close"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.mailbox:0
-msgid "Body (HTML-Web Client Only)"
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid "Error sending mail: %s"
 msgstr ""
 
 #. module: email_template
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
 msgstr ""
 
 #. module: email_template
@@ -946,12 +928,8 @@ msgid "%s (Email Attachment)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
-#, python-format
-msgid ""
-"No personal email accounts are configured for you. \n"
-"Either ask admin to enforce an account for this template or get yourself a "
-"personal email account."
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
 msgstr ""
 
 #. module: email_template
@@ -970,9 +948,16 @@ msgid "User Information"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.account:0
-#: selection:email_template.account,state:0
-msgid "Suspended"
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
 msgstr ""
 
 #. module: email_template
@@ -983,8 +968,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
@@ -994,15 +979,16 @@ 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
-#: help:email_template.account,smtpuname:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
 msgid ""
-"Specify the username if your SMTP server requires authentication, otherwise "
-"leave it empty."
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
 msgstr ""
 
 #. module: email_template
@@ -1038,10 +1024,10 @@ msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,sub_object:0
+#: help:email.template,attachment_ids:0
 msgid ""
-"When a relation field is used this field will show you the type of field you "
-"have selected"
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
 msgstr ""
 
 #. module: email_template
@@ -1064,11 +1050,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 ""
@@ -1087,6 +1068,11 @@ msgid "Sent"
 msgstr ""
 
 #. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
 #: help:email.template,ref_ir_act_window:0
 msgid "Action that will open this email template on Resource records"
 msgstr ""
@@ -1194,6 +1180,15 @@ msgid "Corporate"
 msgstr ""
 
 #. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
 msgstr ""
@@ -1209,21 +1204,13 @@ msgid "Emails will be sent from this approved account."
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Mail from Account %s failed. Probable Reason:MIME Error\n"
-"Description: %s"
-msgstr ""
-
-#. module: email_template
 #: field:email_template.account,send_pref:0
 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
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index 1457de14fd4..57276a71f6e 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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 07:16+0000\n"
+"POT-Creation-Date: 2010-11-18 16:12+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-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-02 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -34,6 +34,31 @@ 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
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"Geen persoonlijke email accounts voor u geconfigureerd. \n"
+"Vraag de beheerder om voor een account voor dit sjabloon te zorgen of zorg "
+"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"
@@ -59,16 +84,18 @@ msgid "Plain Text & HTML with no attachments"
 msgstr "Platte tekst & HTML zonder bijlagen"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
+#: help:email.template,model_object_field:0
 msgid ""
-"Mail from Account %s failed on login. Probable Reason:Could not login to "
-"server\n"
-"Error: %s"
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
 msgstr ""
-"Mail van account %s mislukt bij aanmelding. Waarschijnlijke reden: Kon niet "
-"aanmelden op server\n"
-"Error: %s"
+"Kies het veld van het model dat u gebruiken wilt.\n"
+"Als het een relatieveld betreft, dan kunt u de geneste waarden hieronder "
+"kiezen.\n"
+"(NB: als er geen waarden zijn, controleer dan of u het juiste model heeft "
+"gekozen)"
 
 #. module: email_template
 #: field:email_template.preview,body_html:0
@@ -116,6 +143,15 @@ msgid "Send all mails"
 msgstr "Verstuur alle emails"
 
 #. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Vul de gebruikersnaam in als uw SMTP server authenticatie vereist, laat het "
+"anders leeg."
+
+#. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
 msgstr "Server referentie van email"
@@ -163,6 +199,12 @@ msgstr ""
 "John Doe <john@doe.com>"
 
 #. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "Aan"
+
+#. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
 msgstr "Email account"
@@ -419,6 +461,11 @@ msgid "Mail from Account %s successfully Sent."
 msgstr "Mail van account %s met succes verstuurd."
 
 #. module: email_template
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
+
+#. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
 msgstr "Mako Sjablonen"
@@ -435,17 +482,6 @@ msgid "Sent Items"
 msgstr "Verstuurde berichten"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid ""
-"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
-"Error: %s"
-msgstr ""
-"Mail %s versturen is mislukt. Waarschijnlijke reden: Kon niet aanmelden bij "
-"server\n"
-"Fout: %s"
-
-#. module: email_template
 #: view:email_template.account:0
 msgid "Test Outgoing Connection"
 msgstr "Test uitgaande verbinding"
@@ -499,18 +535,9 @@ msgid "Template"
 msgstr "Sjabloon"
 
 #. module: email_template
-#: help:email.template,model_object_field:0
-msgid ""
-"Select the field from the model you want to use.\n"
-"If it is a relationship field you will be able to choose the nested values "
-"in the box below\n"
-"(Note:If there are no values make sure you have selected the correct model)"
-msgstr ""
-"Kies het veld van het model dat u gebruiken wilt.\n"
-"Als het een relatieveld betreft, dan kunt u de geneste waarden hieronder "
-"kiezen.\n"
-"(NB: als er geen waarden zijn, controleer dan of u het juiste model heeft "
-"gekozen)"
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Sub-veld"
 
 #. module: email_template
 #: view:email.template:0
@@ -613,6 +640,11 @@ msgid "Rec/Sent Date"
 msgstr "Datum ontv/verz"
 
 #. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Begonnen"
+
+#. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
 msgstr "Te versturen overzicht"
@@ -674,14 +706,6 @@ msgid "Window Action"
 msgstr "Vensteractie"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Datetime Extraction failed.Date:%s \\n                      \tError:%s"
-msgstr ""
-"Datumtijd extractie mislukt.Datum:%s \\n                      \tFout:%s"
-
-#. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
 msgstr "HTML, anders Tekst"
@@ -775,9 +799,10 @@ msgid "Outgoing"
 msgstr "Uitgaand"
 
 #. module: email_template
-#: selection:email_template.account,state:0
-msgid "Initiated"
-msgstr "Begonnen"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr "Datumtijd extractie mislukt.Datum:%s                       \tFout:%s"
 
 #. module: email_template
 #: help:email.template,use_sign:0
@@ -814,11 +839,6 @@ msgid "User Name"
 msgstr "Gebruikersnaam"
 
 #. module: email_template
-#: field:email.template,sub_model_object_field:0
-msgid "Sub Field"
-msgstr "Sub-veld"
-
-#. module: email_template
 #: help:email.template,attachment_ids:0
 msgid ""
 "You may attach existing files to this template, so they will be added in all "
@@ -849,6 +869,16 @@ msgid "Save in Drafts"
 msgstr "Bewaar in Concepten"
 
 #. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"Mail vanaf account %s mislukt. Waarschijnlijke reden: MIME Fout\n"
+"Omschrijving: %s"
+
+#. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
 msgstr "TLS"
@@ -861,7 +891,6 @@ msgstr "Taal"
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/email_template_mailbox.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
@@ -882,28 +911,6 @@ msgid "Send Mail"
 msgstr "Verstuur bericht"
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid ""
-"Error sending mail: %s\" % str(e)))\n"
-"        \n"
-"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-"        if ids is None:\n"
-"            ids = []\n"
-"        if context is None:\n"
-"            context = {}\n"
-"        filters = [('folder', '=', 'outbox"
-msgstr ""
-"Fout bij versturen mail: %s\" % str(e)))\n"
-"        \n"
-"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
-"        if ids is None:\n"
-"            ids = []\n"
-"        if context is None:\n"
-"            context = {}\n"
-"        filters = [('folder', '=', 'outbox"
-
-#. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
 "Only users from these groups will be allowed to send mails from this Template"
@@ -954,10 +961,9 @@ msgid "Attachments"
 msgstr "Bijlagen"
 
 #. module: email_template
-#: field:email_template.preview,to:0
-#: field:email_template.send.wizard,to:0
-msgid "To"
-msgstr "Aan"
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "De modulenaam moet uniek zijn !"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
@@ -986,6 +992,17 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid "Error sending mail: %s"
+msgstr "Fout bij het verzenden van mail: %s"
+
+#. module: email_template
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
+
+#. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
 msgstr "Berichttekst (HTML-Alleen web-client)"
@@ -1004,18 +1021,6 @@ msgid "%s (Email Attachment)"
 msgstr "%s (Email bijlage)"
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
-#, python-format
-msgid ""
-"No personal email accounts are configured for you. \n"
-"Either ask admin to enforce an account for this template or get yourself a "
-"personal email account."
-msgstr ""
-"Geen persoonlijke email accounts voor u geconfigureerd. \n"
-"Vraag de beheerder om voor een account voor dit sjabloon te zorgen of zorg "
-"zelf voor een persoonlijke email account."
-
-#. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
 msgstr "Toegestane gebruikersgroepen"
@@ -1031,6 +1036,11 @@ msgid "User Information"
 msgstr "Gebruikersinformatie"
 
 #. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Acties"
+
+#. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
@@ -1046,9 +1056,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
@@ -1057,18 +1067,20 @@ 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
-#: help:email_template.account,smtpuname:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
 msgid ""
-"Specify the username if your SMTP server requires authentication, otherwise "
-"leave it empty."
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
 msgstr ""
-"Vul de gebruikersnaam in als uw SMTP server authenticatie vereist, laat het "
-"anders leeg."
+"Mail %s versturen is mislukt. Waarschijnlijke reden: Kon niet aanmelden bij "
+"server\n"
+"Fout: %s"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
@@ -1134,11 +1146,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"
@@ -1271,6 +1278,18 @@ msgid "Corporate"
 msgstr "Bedrijf"
 
 #. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"Mail van account %s mislukt bij aanmelding. Waarschijnlijke reden: Kon niet "
+"aanmelden op server\n"
+"Error: %s"
+
+#. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
 msgstr "Dit is de assistent voor het versturen van email."
@@ -1286,24 +1305,14 @@ msgid "Emails will be sent from this approved account."
 msgstr "Emails worden verstuurd vanaf deze bevestigde account."
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Mail from Account %s failed. Probable Reason:MIME Error\n"
-"Description: %s"
-msgstr ""
-"Mail vanaf account %s mislukt. Waarschijnlijke reden: MIME Fout\n"
-"Omschrijving: %s"
-
-#. module: email_template
 #: field:email_template.account,send_pref:0
 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
@@ -1344,3 +1353,29 @@ msgstr "Heeft bijlagen"
 #, python-format
 msgid "No Description"
 msgstr "Geen beschrijving"
+
+#, python-format
+#~ msgid ""
+#~ "Error sending mail: %s\" % str(e)))\n"
+#~ "        \n"
+#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+#~ "        if ids is None:\n"
+#~ "            ids = []\n"
+#~ "        if context is None:\n"
+#~ "            context = {}\n"
+#~ "        filters = [('folder', '=', 'outbox"
+#~ msgstr ""
+#~ "Fout bij versturen mail: %s\" % str(e)))\n"
+#~ "        \n"
+#~ "    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+#~ "        if ids is None:\n"
+#~ "            ids = []\n"
+#~ "        if context is None:\n"
+#~ "            context = {}\n"
+#~ "        filters = [('folder', '=', 'outbox"
+
+#, python-format
+#~ msgid ""
+#~ "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
+#~ msgstr ""
+#~ "Datumtijd extractie mislukt.Datum:%s \\n                      \tFout:%s"
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
new file mode 100644
index 00000000000..445456adebf
--- /dev/null
+++ b/addons/email_template/i18n/sr@latin.po
@@ -0,0 +1,1443 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:46+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-11-04 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "zauvek izbrisi Emailove nakon slanja"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Email AutoPodesavanja"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr "Emailovi za visestruke stavke sacuvane u OutBox-u"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr "Licni Emailovi"
+
+#. module: email_template
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modela u definiciji akcijue."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr "Sadrzaj Emaila  "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Carobnjak Slanja Emaila"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Cisti Tekst & HTML bez attachemnta"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"Email naloga %s nije uspeo da se uloguje. MOguci Razlozi: Ne mogu se "
+"konektovati ba server\n"
+"Greska: %s"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Sadrzaj"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "Brisanje zapisa nije uspelo"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+"Selektuj ako ovaj nalog ne pripada specificiranom korisniku ali je deo neke "
+"organizacije npr:info@companydomain.com"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Posalji sada"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "Ne moze se dodati"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Email Nalozi"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Posalji SVE Emailove"
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Referenca Servera Email-a"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr "Razlog: %s"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Odobreno"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+"Carbon umnozi adresu(e), razdvojene zarezom. PlaceHolderi se ovde mogu "
+"koristiti npr. ${object.email_cc}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Nalog"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "HTML zapis"
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
+msgstr ""
+"Opis se koristi kao ime pošiljatelja uz uvslov iz e-pošte, ako to već "
+"navedeno u iz e-pošte, npr: Marko Markovic <marko@markovic.com>"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Email nalog"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr "Slanje Emaila je neuspesno zbog jednog ili vise objekata"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+"Dodaj ovde sve dodatke datog dokumenta ukoliko ih zelis pridruziti Emailu"
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"Predlozeni jezik Email-a. Razmaknice(donja crta) se mogu ovde koristiti. Npr "
+"${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+"Kada izaberete vezu polja, ovo polje ce specificirati sub vrednost koju "
+"mozete koristiti"
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Carobnjak je Zavrsio"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Odgovor - Za"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr "Obriši radnju"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Dozvoli Nalog"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Referentni Dokumenat"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "Uspesno kompletirano"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Oba HTML & Tekst ( Miksovano)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "U redu"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr "Automatsko Brisanje"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "Oba HTML & Tekst ( Aternativno)"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Mako templates not installed"
+msgstr "Mako Obrazac nije instaliran"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "Br. trazenih Poruka"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Standarni Sadrzaj ( text)"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Prikačeni fajlovi"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Standardan sadrzaj"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Od Email-a"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Warning"
+msgstr "Upozorenje"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Nalozi"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Sadrzaj ( text)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr "Emailovi Preduzeca"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+"TIP: Visestruki emailovi su poslati na istom jeziku( prvi koji je "
+"predlozen). Savetujemo vam da saljete E mailove u grupama po odgovarajucim "
+"jezicima."
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+"Adresa primaoca na koja treba odgovoriti ukoliko su drugacije( razlicite) iz "
+"dela adrese  OD. Rezervisana mesta se mogu ovde koristiti."
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Tema"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Moji Emailovi"
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr "Izvestaj ImenaFajla"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Слање"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Ubaci Prosto polje"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Telo ( HTML )"
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+"Iskopiraj adrese , zarezom razdvojene. Rezervisana mesta se mogu ovde "
+"koristiti npr ${object.email_bcc}"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Pregled Šablona"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Sadrzaj ( Samo TEKST-WEB Klijent)"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Dugme čarobnjaka"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr "npr 'marko@markovic.com'  ili  'Marko Markovic <marko@markovic.com>'"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr "Resurs"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, 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
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr "Mail od naloga %s je uspesno poslat"
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr "Mako Sabloni"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid " (Email Attachment)"
+msgstr " (Email Attachment)"
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Poslate Stavke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+"Slanje poruke %s nije uspelo. Verovatan uzrok: Ne mogu se logovati na "
+"server\n"
+"Greska: %s"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Test Izlazne Konekcije"
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "Tekstualna verzija poruke"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+"Adresa primatelja na koju bi trebalo odgovoriti ukoliko se reazlikuje od IZ "
+"dea adrese. Rezervisana mesta( placeholders) se mogu koristiti ovde npr "
+"${object.email_reply_to}"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+"Dugme Pregled Obrasca(Form View) koje se nalazi na baru sa strane  i koje ce "
+"pozvati odredjenu akciju prozora."
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Korisnicki nalog"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+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
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Izveštaj"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Šablon"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+"Selektuj polje modela koje zelis da koristis\n"
+"Ako je to vezno polje,. bicete u mogucnosti da izaberete podveze u polju "
+"ispod\n"
+"( Napomena: Ako nema nikakvog izbora budite sigurni da ste izabrali ispravan "
+"model)"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Napredno"
+
+#. module: email_template
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Neispravni Argumenti"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr "Gradilac Ekstenizja"
+
+#. module: email_template
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "HTML Sadrzaj"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr "Suspendovan nalog"
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr "Ova se vrednost koristi ako je polje prazno"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Pregled Sablona"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Server"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+"Iskopiraj i zalepi vrednost na lokaciju koju zelis da se koristi kao "
+"sistemsku vrednost"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+"Omoguci ovo ukoliko zelis da ukljucis specijalni marker za pracenje u "
+"izlaznim Emailovima, tako da mozes da identifikujes odgovore i zatim ih "
+"linkujes nazad odgovarajucem snimljenom zapisu."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Sadrzaj Texta (Raw HTML)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Potpis"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr "Sub-model"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "Opcije"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Telo teksta (Plain Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Telo teksta (Text)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr "Datum Slanja/Prijema"
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr "Izvestaj za slanje"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "podaci o serveru"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr "Br. Generisanih poruka"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "Detalji poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr "SMTP SERVER ili PORT nije specificiran"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "Napomena: Ovo je Raw HTML."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "Grupisano po..."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr "Visestruki Carobnjak Meilova Korak 1"
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr "Vezni Korisnik"
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr "Telo poruke (Rich Text Clients Only)"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr "Da"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr "Radnja prozora"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Datetime Extraction failed.Date:%s \\n                      \tError:%s"
+msgstr ""
+"Preuzimanje datuma i vremena nije uspelo. Datum:Date:%s \\n \tGreska:%s"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr "HTML, a drugacije Text"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr "U pripremi"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr "Ne"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr "SMTP Port"
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr "Sadrzaj Poste"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "The template name must be unique !"
+msgstr "Ime Sablona mora biti jedinstveno"
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr "BCC"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr "Samo tekst"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: email_template
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr "Interni Naziv Modula"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr "Sifra Poruke"
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr "Prihvatljivo samo za unutrasnje stavke"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+"Nakon klika na 'posalji sve poruke', poruke ce biti poslate u outbox i "
+"ociscene  u sledecem koraku Posalji/Primi"
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr "Odlazno"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Inicirano"
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr "Potpis iz detalja korisnika ce biti pridodat poruci"
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr "Od Naloga"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr "Izmesani sadrzaj"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr "Zahtev za Re-Aktivacijom"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr "Sabloni Poruka"
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr "Korisničko ime"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Pod Polje"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+"Mozete pridodati postojeci fajl ovom sablonu, tako da ce on biti dodat u "
+"svim poruka,a kreiranih iz ovog sablona"
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "Napredne Opcije"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr "OutBox"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr "Sacuvaj u Pripremi"
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr "TLS"
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Jezik"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: 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"
+msgstr "Sablon Poruka"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Slanje/Prijem"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Pošalji poštu"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Error sending mail: %s\" % str(e)))\n"
+"        \n"
+"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"        if ids is None:\n"
+"            ids = []\n"
+"        if context is None:\n"
+"            context = {}\n"
+"        filters = [('folder', '=', 'outbox"
+msgstr ""
+"Greska slanja poruke: %s\" % str(e)))\n"
+"         \n"
+"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"if ids is None:\n"
+"ids = []\n"
+"if context is None:\n"
+"context = {}\n"
+"filters = [('folder', '=', 'outbox"
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+"Samo korisnicima iz ovih grupa ce biti dozvoljeno da salju poruke iz ovog "
+"Sablona"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Slanje POruke (%s)"
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr "Napredne Opcije"
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr "Ime Fajla Izvestaja"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr "Izraz"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Django templates not installed"
+msgstr "Django Sabloni nisu instalirani"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr "Prilozi"
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "Za"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr "Text, inace HTML"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Copy of template "
+msgstr "Kopija Sablona "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr "Izbrisi poruku"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr "Sabloni Poruka za Modele"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr "Zatvori"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr "Sadrzaj (HTML-Web Client Only)"
+
+#. module: email_template
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr "Copy text   \t %s (Email Attachment)"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"Ni jedan locni nalog nije kreiran za vas. \n"
+"Ili pitajte administratora ili napravite sami sebi licni postanski nalog."
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr "Dozvoljene Korisnicke Grupe"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr "Polje"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr "Podaci o korisniku"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "Суспендован"
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+"Ime generisanog Izvestaja. Rezervisana ( Placeholders) mesta se mogu  "
+"koristiti imenu fajla npr: 2009_SO003.pdf"
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Fascikla"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+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"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Specificiraj korisnicko ime ako tvoj SMTP zahteva autorizaciju, inace ostavi "
+"prazno."
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Missing mail account"
+msgstr "Nedostaje Email nalog"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr "SMTP test je prosao uspesno"
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr "Sablon poruka za OpenERP"
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr "Kreiraj akciju"
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr "Upisi ime izlaznog Servera, npr: smtp:yourdomain.com"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+"Kada se koristi vezno polje, ovo polje ce vam pokazati tip polja koje ste "
+"izabrali"
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+"Specificiraj ID-Eporuke za SMTP zaglavlje koje ce se koristiti u odlaznim "
+"emailovima. MOlim upamtite da ce to da izbrise opciju pracenja Resursa! "
+"Rezervisana mesta( placeholders) se mogu ovde koristiti."
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Prima (za)"
+
+#. module: email_template
+#: field:email.template,null_value:0
+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"
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr "Poslato"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr "Akcija koja ce otvoriti ovaj Email u zapisima Resursa"
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+"Vrednost Sifre poruke, ako trebas da je specificiras. Na primer da bi je "
+"automatski prepoznao kasnije."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Emails"
+msgstr "Email-ovi"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr "Šabloni"
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr "Naziv izveštaja"
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "Pracenje Resursa"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "Pregled Sablona Poruke"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "Pregled Poruke"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+"Primalac Emaila. Rezervisana mesta (placeholders) se mogu ovde koristiti "
+"npr. ${object.email_to}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr "Postojeci fajlovi"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS (samo u python 2.6)"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr "Sadrzaj (HTML)"
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+"Iskopiraj ovaj HTML kod u telo svoje HTML poruke da bi se prikazala "
+"informacija u vasoj poruci"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr "email_template.account"
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr "Model"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr "Osnovna Konekcija za datu Sifru NE postoji"
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr "Saradjivanje"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr "Craobnjak Slanja Poste"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "Adrese"
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr "Poruke ce biti poslate sa ovog omogucenog naloga"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"Poruka sa Naloga %s nije prosla. MOguci Razlog: MIME GRESKA\n"
+"Opis: %s"
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr "Format Poruke"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr "Nalozi Preduzeca"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+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
+#, python-format
+msgid "email-template"
+msgstr "sablon-poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, 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"
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr "Jednostavni Carobnjak POruka Korak 1"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+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
+#, python-format
+msgid "No Description"
+msgstr "Bez Opisa"
+
+#~ msgid "Email Data"
+#~ msgstr "Podaci Email-a"
+
+#~ msgid "My Accounts"
+#~ msgstr "Moji Nalozi"
+
+#~ msgid ""
+#~ "File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+#~ msgstr ""
+#~ "Ime fajla moze biti napisano i sa razmaknicama( donja crta) npr "
+#~ "2009_SO003.pdf"
+
+#~ msgid "Enter port number,eg:SMTP-587 "
+#~ msgstr "Upisi broj Port-a npr SMTP-587 "
+
+#~ msgid "E-MAIL Templates"
+#~ msgstr "E-MAIL Obrasci"
+
+#~ msgid "Download Full Mail"
+#~ msgstr "Download Celu poruku"
+
+#~ msgid "The default recipient of email.Placeholders can be used here."
+#~ msgstr ""
+#~ "Predlozeni primalac Email-a. Razmaknice se mogu koristiti ( donja crta)"
+
+#~ msgid "Mailboxes"
+#~ msgstr "Postanski Sanducici"
+
+#~ msgid "Track campaign items"
+#~ msgstr "Prati stavke Kampanje"
+
+#~ msgid "eg: yourname@yourdomain.com "
+#~ msgstr "npr: yourname@yourdomain.com "
+
+#~ msgid "Mailbox"
+#~ msgstr "Postansko Sanduče"
+
+#~ msgid "SMTP Server"
+#~ msgstr "SMTP server"
+
+#~ msgid ""
+#~ "Add here all attachments of the current document you want to include in the "
+#~ "e-mail."
+#~ msgstr ""
+#~ "Ubaci ovde sve attachmente za dati dokument koji zelis da prikljucis poruci"
+
+#~ msgid "The default subject of email. Placeholders can be used here."
+#~ msgstr ""
+#~ "Podrazumevana Tema poruke. Razmaknice se mogu ovde koristiti ( donja crta)"
+
+#~ msgid "File Name Pattern"
+#~ msgstr "Ime fajla paterna"
+
+#~ msgid "Personal Mails"
+#~ msgstr "Licne Poruke"
+
+#~ msgid "SMTP Port "
+#~ msgstr "SMTP Port "
+
+#~ msgid "Personal Accounts"
+#~ msgstr "Licni Nalozi"
+
+#~ msgid "Company Mails"
+#~ msgstr "Poruke Preduzeca"
+
+#~ msgid "Enter name of outgoing server, eg:smtp.gmail.com "
+#~ msgstr "Upisi ime izlaznog servera, npr: smtp.gmail.com "
+
+#~ msgid ""
+#~ "\n"
+#~ "    Email Template is extraction of Power Email basically just to send the "
+#~ "emails.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Sablon Poruke je izvucen iz Power Email, samo da bi poslao poruke.\n"
+#~ "    "
+
+#~ msgid "Default Subject"
+#~ msgstr "Predefinisana tema"
+
+#~ msgid ""
+#~ "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+#~ "here."
+#~ msgstr ""
+#~ "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+#~ "here."
+
+#~ msgid ""
+#~ "Carbon Copy address(es), comma-separated. Placeholders can be used here."
+#~ msgstr ""
+#~ "Carbon Copy address(es), comma-separated. Placeholders can be used here."
+
+#~ msgid ""
+#~ "Enable this if you want the outgoing e-mails to include a tracking marker "
+#~ "that makes it possible to identify the replies an link them back to the "
+#~ "campaign item"
+#~ msgstr ""
+#~ "Omogucava vam , ako zelite da vase izlazne poruke sadrze markera pratnje "
+#~ "koji vam daju mogucnost da kasnije identifikujete odgovore i posaljewte ih "
+#~ "npr stavci Kampanje."
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index 79135b0de4d..17859d6bb9d 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -5,3 +5,6 @@
 "access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
 "access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
 "access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0
+"access_email_template_account_manager","email_template.account","model_email_template_account","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
+"access_email_template_mailbox_manager","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_manager",1,1,1,1