[MERGE]

bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z

3 files changed, 21 insertions, 10 deletions

diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 259061743db..4c21d123e8e 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 17:14+0000\n"
+"PO-Revision-Date: 2010-12-28 13:34+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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -388,6 +388,9 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"Die EMail vom Konto %s ist fehlgeschlagen. Mögliche Ursache: Server "
+"Sendefehler\n"
+" Beschreibung:%s"
 
 #. module: email_template
 #: view:email.template:0
@@ -487,7 +490,7 @@ msgstr "Test Ausgehende Verbindung"
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 msgid "Mailbox"
-msgstr ""
+msgstr "Postfach"
 
 #. module: email_template
 #: help:email.template,reply_to:0
@@ -886,7 +889,7 @@ msgstr "Sende / Empfange"
 #. module: email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Personal Mails"
-msgstr ""
+msgstr "Persönliche EMails"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1019,6 +1022,8 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"Server Sendefehler\n"
+"Beschreibung:%s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -1144,7 +1149,7 @@ msgstr "Gesendet"
 #. module: email_template
 #: sql_constraint:email_template.account:0
 msgid "Another setting already exists with this email ID !"
-msgstr ""
+msgstr "Ein anderes Konto existiert bereits für diese Adresse !"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -1226,6 +1231,10 @@ msgid ""
 "emails.\n"
 "    "
 msgstr ""
+"\n"
+"    Das Modul EMail Template ist eine Extraktion der Erweiterung Power EMail "
+"zur Nutzung für den Mailversand.\n"
+"    "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index 24fcd873c6a..a74a6689f38 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 22:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:58+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -389,6 +389,8 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"Email dall'account: %s fallita. Probabile motivo: Errore invio server\n"
+" Descrizione: %s"
 
 #. module: email_template
 #: view:email.template:0
@@ -752,7 +754,7 @@ msgstr "Bozza"
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Nome interno modello"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -1254,7 +1256,7 @@ msgstr "email_template.account"
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Modello"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index e3f3401217c..e3f3401217c 100755..100644
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml