diff options
| author | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
|---|---|---|
| committer | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
| commit | be2e95656aaa113addea2b510fcdcf2f890eaaa4 (patch) | |
| tree | abcb3dd4ef350a1b8ad0eaffdd2b9a1cb91521af /addons/email_template | |
| parent | b982ea278b33132def3927417b7a854b98b5028a (diff) | |
| parent | 3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff) | |
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/email_template')
34 files changed, 415 insertions, 266 deletions
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index dbe53b3d547..c426e3ae746 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -21,7 +21,7 @@ ############################################################################## { - "name" : "E-Mail Templates", + "name" : "Email Templates", "version" : "1.1", "author" : "OpenERP,OpenLabs", "website" : "http://openerp.com", diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index fff9bdc0f1a..c4ed2eedb85 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -29,11 +29,12 @@ from osv import fields import tools from tools.translate import _ from urllib import quote as quote +_logger = logging.getLogger(__name__) try: from mako.template import Template as MakoTemplate except ImportError: - logging.getLogger('init').warning("email_template: mako templates not available, templating features will not work!") + _logger.warning("email_template: mako templates not available, templating features will not work!") class email_template(osv.osv): "Templates for sending email" @@ -75,7 +76,7 @@ class email_template(osv.osv): result = u'' return result except Exception: - logging.exception("failed to render mako template value %r", template) + _logger.exception("failed to render mako template value %r", template) return u"" def get_email_template(self, cr, uid, template_id=False, record_id=None, context=None): diff --git a/addons/email_template/i18n/ar.po b/addons/email_template/i18n/ar.po index 18d561e2679..90deb09511d 100644 --- a/addons/email_template/i18n/ar.po +++ b/addons/email_template/i18n/ar.po @@ -14,14 +14,14 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 #: field:email_template.preview,subtype:0 msgid "Message type" -msgstr "" +msgstr "نوع الرسالة" #. module: email_template #: field:email.template,report_name:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/bg.po b/addons/email_template/i18n/bg.po index e10d3224c00..f0f3d046f93 100644 --- a/addons/email_template/i18n/bg.po +++ b/addons/email_template/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po index aa1bc5ac755..36d6b3db975 100644 --- a/addons/email_template/i18n/ca.po +++ b/addons/email_template/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/da.po b/addons/email_template/i18n/da.po index 1ad04c65729..1f9ae4b61ab 100644 --- a/addons/email_template/i18n/da.po +++ b/addons/email_template/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po index 966ebb3d770..ac31e737c95 100644 --- a/addons/email_template/i18n/de.po +++ b/addons/email_template/i18n/de.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -185,8 +185,8 @@ msgstr "Auswahl des Typs der Nachricht, 'HTML' oder 'Text'." #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Email-Zusammensetzung Assistent" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -1447,6 +1447,9 @@ msgstr "" #~ "Abläufe können angepasst werden, Informationen mit Partnerbezug könnten " #~ "dabei automatisch eingetragen werden." +#~ msgid "E-mail composition wizard" +#~ msgstr "Email-Zusammensetzung Assistent" + #~ msgid "Text contents" #~ msgstr "Text Inhalt" diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot index ba3e4c1386f..0990a940397 100644 --- a/addons/email_template/i18n/email_template.pot +++ b/addons/email_template/i18n/email_template.pot @@ -173,7 +173,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po index d6c672cb2f9..9ccaad4a037 100644 --- a/addons/email_template/i18n/es.po +++ b/addons/email_template/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/es_CL.po b/addons/email_template/i18n/es_CL.po index 8082654a2df..fb670442336 100644 --- a/addons/email_template/i18n/es_CL.po +++ b/addons/email_template/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n" -"X-Generator: Launchpad (build 15435)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -182,8 +182,8 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Asistente de composición de e-mail" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -687,3 +687,6 @@ msgstr "" #~ msgid "Sidebar button" #~ msgstr "Botón barra lateral" + +#~ msgid "E-mail composition wizard" +#~ msgstr "Asistente de composición de e-mail" diff --git a/addons/email_template/i18n/es_CR.po b/addons/email_template/i18n/es_CR.po index 2326072156c..af3f045fe9d 100644 --- a/addons/email_template/i18n/es_CR.po +++ b/addons/email_template/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" "Language: es\n" #. module: email_template @@ -192,8 +192,8 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Asistente de composición de e-mail" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -1478,6 +1478,9 @@ msgstr "" #~ msgid "Sidebar button" #~ msgstr "Botón de barra lateral" +#~ msgid "E-mail composition wizard" +#~ msgstr "Asistente de composición de e-mail" + #~ msgid "Related Document model" #~ msgstr "Modelo de documento relacionado" diff --git a/addons/email_template/i18n/es_EC.po b/addons/email_template/i18n/es_EC.po index dd8cbb255bd..d00c8539ce4 100644 --- a/addons/email_template/i18n/es_EC.po +++ b/addons/email_template/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/et.po b/addons/email_template/i18n/et.po index dc38ed8bbf2..8fdda1ea29b 100644 --- a/addons/email_template/i18n/et.po +++ b/addons/email_template/i18n/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/fi.po b/addons/email_template/i18n/fi.po index 50ca809fae7..45e0c0d6754 100644 --- a/addons/email_template/i18n/fi.po +++ b/addons/email_template/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -182,8 +182,8 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Sähköpostin luonti velho" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -1367,6 +1367,9 @@ msgstr "Rich-text/HTML versio viestistä (voit käyttä täytettä)" #~ "palvelimelle\n" #~ "Virhe: %s" +#~ msgid "E-mail composition wizard" +#~ msgstr "Sähköpostin luonti velho" + #~ msgid "Related Document model" #~ msgstr "Liittyvä dokumenttimalli" diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po index d06835e6e40..3f830f7993e 100644 --- a/addons/email_template/i18n/fr.po +++ b/addons/email_template/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -190,8 +190,8 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Assistant pour la rédaction de courriels" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -1480,3 +1480,6 @@ msgstr "" #~ msgid "Permanently delete emails after sending" #~ msgstr "Supprimer définitivement les courriels après envoi" + +#~ msgid "E-mail composition wizard" +#~ msgstr "Assistant pour la rédaction de courriels" diff --git a/addons/email_template/i18n/hr.po b/addons/email_template/i18n/hr.po index 8f92becc20d..0d686dfafee 100644 --- a/addons/email_template/i18n/hr.po +++ b/addons/email_template/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po index 87b2671730e..89b810e73fb 100644 --- a/addons/email_template/i18n/hu.po +++ b/addons/email_template/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po index a7a59048cc9..98b901977b4 100644 --- a/addons/email_template/i18n/it.po +++ b/addons/email_template/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po index 60b491ad0c2..b9fc44a311b 100644 --- a/addons/email_template/i18n/ja.po +++ b/addons/email_template/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n" -"X-Generator: Launchpad (build 15288)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -182,8 +182,8 @@ msgstr "メッセージのタイプ。通常はテキストあるいはリッチ #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Eメール作成ツール" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -697,6 +697,9 @@ msgstr "メッセージのリッチテキスト / HTML 版" #~ msgid "Sidebar button" #~ msgstr "サイドバーボタン" +#~ msgid "E-mail composition wizard" +#~ msgstr "Eメール作成ツール" + #~ msgid "Related Document model" #~ msgstr "関連する文書モデル" diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po index a3579007636..67059433f23 100644 --- a/addons/email_template/i18n/mn.po +++ b/addons/email_template/i18n/mn.po @@ -14,14 +14,14 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 #: field:email_template.preview,subtype:0 msgid "Message type" -msgstr "" +msgstr "Зурвасын төрөл" #. module: email_template #: field:email.template,report_name:0 @@ -32,23 +32,23 @@ msgstr "Файлын нэр" #. module: email_template #: view:email.template:0 msgid "SMTP Server" -msgstr "" +msgstr "SMTP сервер" #. module: email_template #: view:email.template:0 msgid "Remove the sidebar button currently displayed on related documents" -msgstr "" +msgstr "Холбогдох баримтын одоо харгадаж байгаа хажуугийн багажуудыг арилгах" #. module: email_template #: field:email.template,ref_ir_act_window:0 #: field:email_template.preview,ref_ir_act_window:0 msgid "Sidebar action" -msgstr "" +msgstr "Хажуугийн багажийн үйлдэл" #. module: email_template #: view:mail.compose.message:0 msgid "Save as a new template" -msgstr "" +msgstr "Шинэ үлгэрээр хадгалах" #. module: email_template #: help:email.template,subject:0 @@ -66,7 +66,7 @@ msgstr "" #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Received" -msgstr "" +msgstr "Хүлээн авсан" #. module: email_template #: view:email.template:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template @@ -1229,3 +1229,6 @@ msgstr "" #, python-format #~ msgid "No Description" #~ msgstr "Тайлбаргүй" + +#~ msgid "Sidebar button" +#~ msgstr "Хажуугийн даруул" diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po index 0dbaa299758..91821f6bb9d 100644 --- a/addons/email_template/i18n/nb.po +++ b/addons/email_template/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po index 75ce6985e25..f2192e8043b 100644 --- a/addons/email_template/i18n/nl.po +++ b/addons/email_template/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-05-10 18:29+0000\n" -"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2012-07-02 15:02+0000\n" +"Last-Translator: Erwin <Unknown>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n" +"X-Generator: Launchpad (build 15531)\n" #. module: email_template #: field:email.template,subtype:0 @@ -191,8 +191,8 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "E-mail opmaak wizard" +msgid "Email composition wizard" +msgstr "E-mail samenstellen wizard" #. module: email_template #: view:email.template:0 @@ -1461,6 +1461,9 @@ msgstr "" #~ "klant profiel velden, zodat een relatienaam of andere relatie informatie " #~ "automatisch kan worden ingevoegd." +#~ msgid "E-mail composition wizard" +#~ msgstr "E-mail opmaak wizard" + #~ msgid "Rich-text contents" #~ msgstr "Rich-tekst inhoud" diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po index c7cf7855dcf..3e5285121b9 100644 --- a/addons/email_template/i18n/pl.po +++ b/addons/email_template/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -183,7 +183,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po index 1b9bfe6f725..83496c62cda 100644 --- a/addons/email_template/i18n/pt.po +++ b/addons/email_template/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -190,8 +190,8 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "Assistente de composição de e-mail" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -1463,6 +1463,9 @@ msgstr "" #~ msgid "Sidebar button" #~ msgstr "Botão barra lateral" +#~ msgid "E-mail composition wizard" +#~ msgstr "Assistente de composição de e-mail" + #~ msgid "Related Document model" #~ msgstr "Modelo de documento relacionado" diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po index b80e8e26adc..bf947a41163 100644 --- a/addons/email_template/i18n/pt_BR.po +++ b/addons/email_template/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po index 03aa71047a5..eff630ade9a 100644 --- a/addons/email_template/i18n/ro.po +++ b/addons/email_template/i18n/ro.po @@ -14,14 +14,14 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 #: field:email_template.preview,subtype:0 msgid "Message type" -msgstr "" +msgstr "Tip de mesaj" #. module: email_template #: field:email.template,report_name:0 @@ -32,41 +32,42 @@ msgstr "Raport nume fisier" #. module: email_template #: view:email.template:0 msgid "SMTP Server" -msgstr "" +msgstr "Server SMTP" #. module: email_template #: view:email.template:0 msgid "Remove the sidebar button currently displayed on related documents" msgstr "" +"Sterge butonul barei laterale afisat pentru moment in documentele asociate" #. module: email_template #: field:email.template,ref_ir_act_window:0 #: field:email_template.preview,ref_ir_act_window:0 msgid "Sidebar action" -msgstr "" +msgstr "Actiune bara laterala" #. module: email_template #: view:mail.compose.message:0 msgid "Save as a new template" -msgstr "" +msgstr "Salveaza ca sablon nou" #. module: email_template #: help:email.template,subject:0 #: help:email_template.preview,subject:0 msgid "Subject (placeholders may be used here)" -msgstr "" +msgstr "Subiect (aici puteti folosi inlocuitori)" #. module: email_template #: help:email.template,email_cc:0 #: help:email_template.preview,email_cc:0 msgid "Carbon copy recipients (placeholders may be used here)" -msgstr "" +msgstr "Destinatari cc (copie carbon) (aici puteti folosi inlocuitori)" #. module: email_template #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Received" -msgstr "" +msgstr "Primit" #. module: email_template #: view:email.template:0 @@ -82,45 +83,48 @@ msgid "" "Name to use for the generated report file (may contain placeholders)\n" "The extension can be omitted and will then come from the report type." msgstr "" +"Numele care va fi folosit pentru fisierul raportului generat (poate sa " +"contina inlocuitori)\n" +"Extensia poate sa fie omisa, iar atunci va reiesi din tipul raportului." #. module: email_template #: view:email.template:0 msgid "Attach existing files" -msgstr "" +msgstr "Ataseaza fisiere existente" #. module: email_template #: view:email.template:0 msgid "Email Content" -msgstr "" +msgstr "Continut E-mail" #. module: email_template #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Cancelled" -msgstr "" +msgstr "Anulat(a)" #. module: email_template #: field:email.template,reply_to:0 #: field:email_template.preview,reply_to:0 msgid "Reply-To" -msgstr "Răspunde către:" +msgstr "Raspunde" #. module: email_template #: field:email.template,auto_delete:0 #: field:email_template.preview,auto_delete:0 msgid "Auto Delete" -msgstr "Auto stergere" +msgstr "Sterge Automat" #. module: email_template #: code:addons/email_template/email_template.py:218 #, python-format msgid "Warning" -msgstr "Atenție" +msgstr "Atentionare" #. module: email_template #: model:ir.model,name:email_template.model_res_partner msgid "Partner" -msgstr "" +msgstr "Partener" #. module: email_template #: field:email.template,subject:0 @@ -137,19 +141,19 @@ msgstr "De la" #. module: email_template #: field:mail.compose.message,template_id:0 msgid "Template" -msgstr "Șablon" +msgstr "Sablon" #. module: email_template #: field:email.template,partner_id:0 #: field:email_template.preview,partner_id:0 msgid "Related partner" -msgstr "" +msgstr "Partener asociat" #. module: email_template #: field:email.template,sub_model_object_field:0 #: field:email_template.preview,sub_model_object_field:0 msgid "Sub-field" -msgstr "" +msgstr "Sub-fisier" #. module: email_template #: view:email.template:0 @@ -157,6 +161,8 @@ msgid "" "Display a button in the sidebar of related documents to open a composition " "wizard with this template" msgstr "" +"Afiseaza un buton in bara laterala a documentelor asociate pentru a deschide " +"un wizard de compozitie cu acest sablon" #. module: email_template #: field:email.template,state:0 @@ -177,27 +183,29 @@ msgid "" "Type of message, usually 'html' or 'plain', used to select plaintext or rich " "text contents accordingly" msgstr "" +"Tipul de mesaj, de obicei 'html' sau 'simplu', folosit pentru a selecta ca " +"atare cuprinsul textului simplu sau textului imbogatit" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template #: view:email.template:0 msgid "Dynamic Values Builder" -msgstr "" +msgstr "Creator Valori Dinamice" #. module: email_template #: field:email.template,res_id:0 msgid "Related Document ID" -msgstr "" +msgstr "ID Document Asociat" #. module: email_template #: field:email.template,lang:0 #: field:email_template.preview,lang:0 msgid "Language Selection" -msgstr "" +msgstr "Selectare limba" #. module: email_template #: view:email.template:0 @@ -208,7 +216,7 @@ msgstr "Avansat" #: field:email.template,email_to:0 #: field:email_template.preview,email_to:0 msgid "To" -msgstr "Către" +msgstr "Catre" #. module: email_template #: field:email.template,model:0 @@ -224,17 +232,20 @@ msgid "" "If it is a relationship field you will be able to select a target field at " "the destination of the relationship." msgstr "" +"Selectati campul tinta din modelul documentului asociat.\n" +"Daca este un camp de relatie, veti putea sa selectati un camp tinta la " +"destinatia relatiei." #. module: email_template #: view:email.template:0 msgid "Preview Template" -msgstr "Previzualizare şablon" +msgstr "Previzualizare Sablon" #. module: email_template #: field:email.template,null_value:0 #: field:email_template.preview,null_value:0 msgid "Null value" -msgstr "" +msgstr "Valoare nula" #. module: email_template #: field:email.template,sub_object:0 @@ -251,37 +262,37 @@ msgid "" "resource record. This is useful for CRM leads for example" msgstr "" "Activati daca doriti sa includeti un marcator special de urmarire in email-" -"urile de iesire, astfel ca puteti identifica raspunsuri si le puteti lega de " -"inregistrarea resursa corespunzatoare. Aceasta este utila de exemplu pentru " -"piste MRC." +"urile de iesire, astfel incat sa puteti identifica raspunsuri si sa le " +"puteti lega de inregistrarea resursei corespunzatoare. Aceasta este utila de " +"exemplu pentru piste MRC." #. module: email_template #: field:mail.compose.message,use_template:0 msgid "Use Template" -msgstr "" +msgstr "Foloseste Sablonul" #. module: email_template #: field:email.template,attachment_ids:0 #: field:email_template.preview,attachment_ids:0 msgid "Files to attach" -msgstr "" +msgstr "Fisiere care vor fi atasate" #. module: email_template #: view:email.template:0 msgid "Options" -msgstr "Opțiuni" +msgstr "Optiuni" #. module: email_template #: field:email.template,model_id:0 #: field:email_template.preview,model_id:0 msgid "Related document model" -msgstr "" +msgstr "Model document asociat" #. module: email_template #: help:email.template,email_from:0 #: help:email_template.preview,email_from:0 msgid "Sender address (placeholders may be used here)" -msgstr "" +msgstr "Adresa expeditorului (aici pot fi folositi inlocuitori)" #. module: email_template #: help:res.partner,opt_out:0 @@ -289,51 +300,53 @@ msgid "" "If checked, this partner will not receive any automated email notifications, " "such as the availability of invoices." msgstr "" +"Daca bifati, acest partener nu va primi nicio notificare automata prin e-" +"mail, cum ar fi disponibilitatea facturilor." #. module: email_template #: view:email.template:0 msgid "Note: This is Raw HTML." -msgstr "Nota: Acesta este un HTML gol." +msgstr "Nota: Acesta este un HTML brut." #. module: email_template #: view:email.template:0 msgid "Group by..." -msgstr "Grupat după..." +msgstr "Grupeaza dupa..." #. module: email_template #: field:email.template,user_signature:0 #: field:email_template.preview,user_signature:0 msgid "Add Signature" -msgstr "" +msgstr "Adauga Semnatura" #. module: email_template #: help:email.template,body_text:0 #: help:email_template.preview,body_text:0 msgid "Plaintext version of the message (placeholders may be used here)" -msgstr "" +msgstr "Versiunea simpla a mesajului (aici pot fi folositi inlocuitori)" #. module: email_template #: help:email.template,original:0 #: help:email_template.preview,original:0 msgid "Original version of the message, as it was sent on the network" -msgstr "" +msgstr "Versiunea originala a mesajului, asa cum a fost trimisa pe internet" #. module: email_template #: code:addons/email_template/email_template.py:230 #, python-format msgid "(copy)" -msgstr "" +msgstr "(copie)" #. module: email_template #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Outgoing" -msgstr "Ieșiri" +msgstr "Iesire" #. module: email_template #: view:mail.compose.message:0 msgid "Use a message template" -msgstr "" +msgstr "Folositi un mesaj sablon" #. module: email_template #: help:email.template,user_signature:0 @@ -342,12 +355,14 @@ msgid "" "If checked, the user's signature will be appended to the text version of the " "message" msgstr "" +"Daca bifati, semnatura utilizatorului va fi adaugata la versiunea text a " +"mesajului" #. module: email_template #: view:email.template:0 #: view:email_template.preview:0 msgid "Body (Rich/HTML)" -msgstr "" +msgstr "Corp (Imbogatit/HTML)" #. module: email_template #: help:email.template,sub_object:0 @@ -356,44 +371,46 @@ msgid "" "When a relationship field is selected as first field, this field shows the " "document model the relationship goes to." msgstr "" +"Atunci cand un camp de relatie este selectat ca prim camp, acest camp arata " +"modelul documentului la care se refera relatia." #. module: email_template #: model:ir.model,name:email_template.model_email_template msgid "Email Templates" -msgstr "Şabloane e-mail" +msgstr "Sabloane e-mail" #. module: email_template #: field:email.template,date:0 #: field:email_template.preview,date:0 msgid "Date" -msgstr "" +msgstr "Data" #. module: email_template #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview msgid "Template Preview" -msgstr "Previzualizare şablon" +msgstr "Previzualizare Sablon" #. module: email_template #: field:email.template,message_id:0 #: field:email_template.preview,message_id:0 msgid "Message-Id" -msgstr "" +msgstr "Id-Mesaj" #. module: email_template #: view:email.template:0 msgid "Add sidebar button" -msgstr "" +msgstr "Adauga buton bara laterala" #. module: email_template #: view:email.template:0 #: view:email_template.preview:0 msgid "Body (Text)" -msgstr "Corp (text)" +msgstr "Corp (Text)" #. module: email_template #: view:email.template:0 msgid "Advanced Options" -msgstr "Opțiuni avansate" +msgstr "Optiuni Avansate" #. module: email_template #: code:addons/email_template/email_template.py:183 @@ -417,7 +434,7 @@ msgstr "Expresie" #: field:email.template,original:0 #: field:email_template.preview,original:0 msgid "Original" -msgstr "" +msgstr "Original" #. module: email_template #: view:email.template:0 @@ -431,22 +448,23 @@ msgid "" "Final placeholder expression, to be copy-pasted in the desired template " "field." msgstr "" +"Exprsie inlocuitoare finala, care va fi copiata in campul sablon dorit." #. module: email_template #: view:email.template:0 msgid "Attachments" -msgstr "Atașamente" +msgstr "Atasamente" #. module: email_template #: view:email.template:0 msgid "Email Details" -msgstr "" +msgstr "Detalii e-mail" #. module: email_template #: field:email.template,email_cc:0 #: field:email_template.preview,email_cc:0 msgid "Cc" -msgstr "" +msgstr "Cc (copie carbon)" #. module: email_template #: field:email.template,body_text:0 @@ -459,23 +477,24 @@ msgstr "" #: help:email_template.preview,auto_delete:0 msgid "Permanently delete this email after sending it, to save space" msgstr "" +"Sterge definitiv acest mesaj dupa ce il trimite, pentru a economisi spatiu" #. module: email_template #: field:email.template,references:0 #: field:email_template.preview,references:0 msgid "References" -msgstr "" +msgstr "Referinte" #. module: email_template #: field:email.template,display_text:0 #: field:email_template.preview,display_text:0 msgid "Display Text" -msgstr "" +msgstr "Afiseaza Text" #. module: email_template #: view:email_template.preview:0 msgid "Close" -msgstr "Închide" +msgstr "Inchide" #. module: email_template #: help:email.template,attachment_ids:0 @@ -484,6 +503,8 @@ msgid "" "You may attach files to this template, to be added to all emails created " "from this template" msgstr "" +"Puteti atasa fisiere la acest sablon, pentru a fi anexate tuturor e-mail-" +"urilor create din acest sablon" #. module: email_template #: help:email.template,headers:0 @@ -492,12 +513,14 @@ msgid "" "Full message headers, e.g. SMTP session headers (usually available on " "inbound messages only)" msgstr "" +"Antete mesaje complete, de exemplu antetele sesiunii SMTP (de obicei " +"disponibile doar pentru mesajele primite)" #. module: email_template #: field:email.template,mail_server_id:0 #: field:email_template.preview,mail_server_id:0 msgid "Outgoing Mail Server" -msgstr "" +msgstr "Server Iesire E-mail-uri" #. module: email_template #: help:email.template,ref_ir_act_window:0 @@ -506,25 +529,27 @@ msgid "" "Sidebar action to make this template available on records of the related " "document model" msgstr "" +"Bara laterala de actiune pentru a face ca acest sablon sa fie disponibil in " +"inregistrarile modelului documentului asociat" #. module: email_template #: field:email.template,model_object_field:0 #: field:email_template.preview,model_object_field:0 msgid "Field" -msgstr "Câmp" +msgstr "Camp" #. module: email_template #: field:email.template,user_id:0 #: field:email_template.preview,user_id:0 msgid "Related user" -msgstr "" +msgstr "Utilizator asociat" #. 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_templates msgid "Templates" -msgstr "Șabloane" +msgstr "Sabloane" #. module: email_template #: field:res.partner,opt_out:0 @@ -536,6 +561,7 @@ msgstr "" #: help:email_template.preview,email_bcc:0 msgid "Blind carbon copy recipients (placeholders may be used here)" msgstr "" +"Destinatari bcc (copie carbon invizibila) (aici se pot folosi inlocuitori)" #. module: email_template #: help:email.template,lang:0 @@ -546,17 +572,23 @@ msgid "" "a placeholder expression that provides the appropriate language code, e.g. " "${object.partner_id.lang.code}." msgstr "" +"Limba optionala de traducere (cod ISO) care va fi selectata atunci cand " +"trimiteti un e-mail. Daca nu este setata, va fi folosita versiunea in limba " +"engleza. Aceasta ar trebui de obicei sa fie o expresie inlocuitoare care " +"furnizeaza codul limbii corespunzatoare, de exemplu " +"${obiect.partener_id.cod.limba}." #. module: email_template #: field:email_template.preview,res_id:0 msgid "Sample Document" -msgstr "" +msgstr "Document esantion" #. module: email_template #: help:email.template,email_to:0 #: help:email_template.preview,email_to:0 msgid "Comma-separated recipient addresses (placeholders may be used here)" msgstr "" +"Adrese destinatari despartite prin virgula (aici pot fi folositi inlocuitori)" #. module: email_template #: field:email.template,name:0 @@ -590,35 +622,42 @@ msgid "" "instead.\n" "Placeholders must be used here, as this value always needs to be unique!" msgstr "" +"Antetul SMTP ID-mesaj care va fi folosit in mesajele trimise pe baza acetui " +"sablon. Va rugam sa observati faptul ca acesta anuleaza optiunea 'Urmarire " +"Resursa', astfel ca daca aveti nevoie sa urmariti raspunsurile la e-mail-" +"urile trimise, activati in schimb aceasta optiune.\n" +"Aici trebuie folositi inlocuitori, deoarece aceasta valoare trebuie sa fie " +"intotdeauna unica!" #. module: email_template #: field:email.template,headers:0 #: field:email_template.preview,headers:0 msgid "Message headers" -msgstr "" +msgstr "Antete mesaj" #. module: email_template #: field:email.template,email_bcc:0 #: field:email_template.preview,email_bcc:0 msgid "Bcc" -msgstr "" +msgstr "Bcc (blind carbon copy) (copie carbon invizibila)" #. module: email_template #: help:email.template,reply_to:0 #: help:email_template.preview,reply_to:0 msgid "Preferred response address (placeholders may be used here)" -msgstr "" +msgstr "Adresa de raspuns preferata (aici pot fi folositi inlocuitori)" #. module: email_template #: view:email.template:0 msgid "Remove sidebar button" -msgstr "" +msgstr "Sterge butonul barei laterale" #. module: email_template #: help:email.template,null_value:0 #: help:email_template.preview,null_value:0 msgid "Optional value to use if the target field is empty" msgstr "" +"Valoarea optionala care va fi folosita in cazul in care campul tinta este gol" #. module: email_template #: view:email.template:0 @@ -629,24 +668,24 @@ msgstr "Model" #: help:email.template,references:0 #: help:email_template.preview,references:0 msgid "Message references, such as identifiers of previous messages" -msgstr "" +msgstr "Referinte mesaj, cum ar fi identificatorii mesajelor precedente" #. module: email_template #: help:email.template,ref_ir_value:0 #: help:email_template.preview,ref_ir_value:0 msgid "Sidebar button to open the sidebar action" -msgstr "" +msgstr "Buton bara laterala pentru a deschide actiunea barei laterale" #. module: email_template #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Eroare ! Nu puteti crea membri asociati recursiv." #. module: email_template #: code:addons/email_template/email_template.py:218 #, python-format msgid "Deletion of the action record failed." -msgstr "" +msgstr "Stergerea inregistrarii actiunii a esuat." #. module: email_template #: help:email.template,mail_server_id:0 @@ -655,12 +694,14 @@ msgid "" "Optional preferred server for outgoing mails. If not set, the highest " "priority one will be used." msgstr "" +"Server optional preferat pentru trimiterea e-mail-urilor. Daca nu este " +"setat, va fi folosit cel cu prioritatea cea mai mare." #. module: email_template #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Delivery Failed" -msgstr "" +msgstr "Livrarea a esuat" #. module: email_template #: help:email.template,sub_model_object_field:0 @@ -669,23 +710,27 @@ msgid "" "When a relationship field is selected as first field, this field lets you " "select the target field within the destination document model (sub-model)." msgstr "" +"Atunci cand un camp de relatie este selectat drept primul camp, acest camp " +"va permite sa selectati campul tinta din cadrul modelului documentului " +"destinatie (sub-model)." #. module: email_template #: view:email.template:0 msgid "Attach Report" -msgstr "" +msgstr "Ataseaza Raport" #. module: email_template #: field:email.template,report_template:0 #: field:email_template.preview,report_template:0 msgid "Optional report to print and attach" -msgstr "" +msgstr "Raport optional care va fi printat si atasat" #. module: email_template #: help:email.template,body_html:0 #: help:email_template.preview,body_html:0 msgid "Rich-text/HTML version of the message (placeholders may be used here)" msgstr "" +"Versiunea rich-text?HTML a mesajului (aici pot fi folositi inlocuitori)" #~ msgid "" #~ "Select the field from the model you want to use.\n" @@ -1406,3 +1451,21 @@ msgstr "" #~ "Email-ul din contul %s nu a reusit conectarea. Motiv probabil: Nu s-a putut " #~ "face conectarea la server\n" #~ "Eroare: %s" + +#~ msgid "Sidebar button" +#~ msgstr "Buton bara laterala" + +#~ msgid "E-mail composition wizard" +#~ msgstr "Asistent compunere e-mail" + +#~ msgid "Related Document model" +#~ msgstr "Model Document asociat" + +#~ msgid "Rich-text contents" +#~ msgstr "Continuturi rich-text (text imbogatit)" + +#~ msgid "Text contents" +#~ msgstr "Cuprins text" + +#~ msgid "Opt-out" +#~ msgstr "Nu participa" diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po index 1f0e26ef791..d466181524d 100644 --- a/addons/email_template/i18n/ru.po +++ b/addons/email_template/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po index e6f2be8aac2..86f5ec44931 100644 --- a/addons/email_template/i18n/sr.po +++ b/addons/email_template/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po index fca9baf9d67..444b20757e9 100644 --- a/addons/email_template/i18n/sr@latin.po +++ b/addons/email_template/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -180,7 +180,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po index c2e89402313..17fcfa854b7 100644 --- a/addons/email_template/i18n/sv.po +++ b/addons/email_template/i18n/sv.po @@ -14,59 +14,60 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 #: field:email_template.preview,subtype:0 msgid "Message type" -msgstr "" +msgstr "Meddelandetyp" #. module: email_template #: field:email.template,report_name:0 #: field:email_template.preview,report_name:0 msgid "Report Filename" -msgstr "" +msgstr "Rapportfilnamn" #. module: email_template #: view:email.template:0 msgid "SMTP Server" -msgstr "" +msgstr "SMTP-server" #. module: email_template #: view:email.template:0 msgid "Remove the sidebar button currently displayed on related documents" msgstr "" +"Tar bort knappen i sidramen som just nu visas för relaterade dokument" #. module: email_template #: field:email.template,ref_ir_act_window:0 #: field:email_template.preview,ref_ir_act_window:0 msgid "Sidebar action" -msgstr "" +msgstr "Åtgärd i sidramen" #. module: email_template #: view:mail.compose.message:0 msgid "Save as a new template" -msgstr "" +msgstr "Spara som en ny mall" #. module: email_template #: help:email.template,subject:0 #: help:email_template.preview,subject:0 msgid "Subject (placeholders may be used here)" -msgstr "" +msgstr "Ämnesrad (platshållare kan användas här)" #. module: email_template #: help:email.template,email_cc:0 #: help:email_template.preview,email_cc:0 msgid "Carbon copy recipients (placeholders may be used here)" -msgstr "" +msgstr "Kopiemottagare (platshållare kan användas här)" #. module: email_template #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Received" -msgstr "" +msgstr "Mottaget" #. module: email_template #: view:email.template:0 @@ -82,22 +83,25 @@ msgid "" "Name to use for the generated report file (may contain placeholders)\n" "The extension can be omitted and will then come from the report type." msgstr "" +"Namn att använda för den genererade rapportfilen (kan innehålla " +"platshållare)\n" +"Tillägget kan utelämnas och hämtas då istället från rapporttypen." #. module: email_template #: view:email.template:0 msgid "Attach existing files" -msgstr "" +msgstr "Bilägg existerande filer" #. module: email_template #: view:email.template:0 msgid "Email Content" -msgstr "" +msgstr "E-postinnehåll" #. module: email_template #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Cancelled" -msgstr "" +msgstr "Avbruten" #. module: email_template #: field:email.template,reply_to:0 @@ -109,7 +113,7 @@ msgstr "Svara till" #: field:email.template,auto_delete:0 #: field:email_template.preview,auto_delete:0 msgid "Auto Delete" -msgstr "" +msgstr "Autoradera" #. module: email_template #: code:addons/email_template/email_template.py:218 @@ -120,13 +124,13 @@ msgstr "Varning" #. module: email_template #: model:ir.model,name:email_template.model_res_partner msgid "Partner" -msgstr "" +msgstr "Företag" #. module: email_template #: field:email.template,subject:0 #: field:email_template.preview,subject:0 msgid "Subject" -msgstr "Rubrik" +msgstr "Ämne" #. module: email_template #: field:email.template,email_from:0 @@ -143,13 +147,13 @@ msgstr "Mall" #: field:email.template,partner_id:0 #: field:email_template.preview,partner_id:0 msgid "Related partner" -msgstr "" +msgstr "Relaterat företag" #. module: email_template #: field:email.template,sub_model_object_field:0 #: field:email_template.preview,sub_model_object_field:0 msgid "Sub-field" -msgstr "" +msgstr "Underfält" #. module: email_template #: view:email.template:0 @@ -157,12 +161,14 @@ msgid "" "Display a button in the sidebar of related documents to open a composition " "wizard with this template" msgstr "" +"Visa en knapp i sidoramen med relaterade dokument för att öppna tillsammans " +"med denna mall" #. module: email_template #: field:email.template,state:0 #: field:email_template.preview,state:0 msgid "State" -msgstr "" +msgstr "Tillstånd" #. module: email_template #: selection:email.template,state:0 @@ -177,27 +183,29 @@ msgid "" "Type of message, usually 'html' or 'plain', used to select plaintext or rich " "text contents accordingly" msgstr "" +"Typ av meddelande, vanligtvis \"html\" eller \"vanligt\", används för att " +"välja klartext eller utsmyckad text i överensstämmelse härmed" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template #: view:email.template:0 msgid "Dynamic Values Builder" -msgstr "" +msgstr "Bygg från variabler" #. module: email_template #: field:email.template,res_id:0 msgid "Related Document ID" -msgstr "" +msgstr "ID relaterat dokument" #. module: email_template #: field:email.template,lang:0 #: field:email_template.preview,lang:0 msgid "Language Selection" -msgstr "" +msgstr "Språkval" #. module: email_template #: view:email.template:0 @@ -224,23 +232,26 @@ msgid "" "If it is a relationship field you will be able to select a target field at " "the destination of the relationship." msgstr "" +"Välj målfält från det relaterade dokumentets modell.\n" +"Om det är ett relationsfält som kan du välja fält från det relaterade " +"objektet" #. module: email_template #: view:email.template:0 msgid "Preview Template" -msgstr "" +msgstr "Förhandsgranskning av mallen" #. module: email_template #: field:email.template,null_value:0 #: field:email_template.preview,null_value:0 msgid "Null value" -msgstr "" +msgstr "Nollvärde" #. module: email_template #: field:email.template,sub_object:0 #: field:email_template.preview,sub_object:0 msgid "Sub-model" -msgstr "" +msgstr "Under-modell" #. module: email_template #: help:email.template,track_campaign_item:0 @@ -250,17 +261,20 @@ msgid "" "emails so you can identify replies and link them back to the corresponding " "resource record. This is useful for CRM leads for example" msgstr "" +"Aktivera detta när du vill införa en särskild uppföljningsmarkör i utgående " +"e-post så att du kan identifiera svar och länka dem tillbaka till " +"motsvarande resursposten. Detta är användbart för exempelvis CRM kundämnen." #. module: email_template #: field:mail.compose.message,use_template:0 msgid "Use Template" -msgstr "" +msgstr "Använd mall" #. module: email_template #: field:email.template,attachment_ids:0 #: field:email_template.preview,attachment_ids:0 msgid "Files to attach" -msgstr "" +msgstr "Filer att bifoga" #. module: email_template #: view:email.template:0 @@ -271,13 +285,13 @@ msgstr "Alternativ" #: field:email.template,model_id:0 #: field:email_template.preview,model_id:0 msgid "Related document model" -msgstr "" +msgstr "Relaterad dokumentmodell" #. module: email_template #: help:email.template,email_from:0 #: help:email_template.preview,email_from:0 msgid "Sender address (placeholders may be used here)" -msgstr "" +msgstr "Avsändare (platshållare kan användas här)" #. module: email_template #: help:res.partner,opt_out:0 @@ -285,11 +299,13 @@ msgid "" "If checked, this partner will not receive any automated email notifications, " "such as the availability of invoices." msgstr "" +"Om markerad, kommer detta företag inte att få några automatiska e-" +"postmeddelanden, till exempel fakturor." #. module: email_template #: view:email.template:0 msgid "Note: This is Raw HTML." -msgstr "" +msgstr "Notera: Detta är ren HTML" #. module: email_template #: view:email.template:0 @@ -300,25 +316,25 @@ msgstr "Gruppera på..." #: field:email.template,user_signature:0 #: field:email_template.preview,user_signature:0 msgid "Add Signature" -msgstr "" +msgstr "Lägg till signatur" #. module: email_template #: help:email.template,body_text:0 #: help:email_template.preview,body_text:0 msgid "Plaintext version of the message (placeholders may be used here)" -msgstr "" +msgstr "Ren textversion av meddelandet (platshållare kan användas här)" #. module: email_template #: help:email.template,original:0 #: help:email_template.preview,original:0 msgid "Original version of the message, as it was sent on the network" -msgstr "" +msgstr "Originalversion av meddelandet, som det var sänt på nätverket" #. module: email_template #: code:addons/email_template/email_template.py:230 #, python-format msgid "(copy)" -msgstr "" +msgstr "(kopia)" #. module: email_template #: selection:email.template,state:0 @@ -329,7 +345,7 @@ msgstr "Utgående" #. module: email_template #: view:mail.compose.message:0 msgid "Use a message template" -msgstr "" +msgstr "Använd meddelandemall" #. module: email_template #: help:email.template,user_signature:0 @@ -338,12 +354,14 @@ msgid "" "If checked, the user's signature will be appended to the text version of the " "message" msgstr "" +"Om markerad, kommer användaren signatur fogas till textversionen av " +"meddelandet" #. module: email_template #: view:email.template:0 #: view:email_template.preview:0 msgid "Body (Rich/HTML)" -msgstr "" +msgstr "Brödtext (Utsmyckad/HTML)" #. module: email_template #: help:email.template,sub_object:0 @@ -352,39 +370,41 @@ msgid "" "When a relationship field is selected as first field, this field shows the " "document model the relationship goes to." msgstr "" +"När en relaterad term är markerad som första område, visar det här fältet " +"förlagan relationen går till." #. module: email_template #: model:ir.model,name:email_template.model_email_template msgid "Email Templates" -msgstr "" +msgstr "E-postmallar" #. module: email_template #: field:email.template,date:0 #: field:email_template.preview,date:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: email_template #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview msgid "Template Preview" -msgstr "" +msgstr "Förhandsgranska mall" #. module: email_template #: field:email.template,message_id:0 #: field:email_template.preview,message_id:0 msgid "Message-Id" -msgstr "" +msgstr "Meddelande-id" #. module: email_template #: view:email.template:0 msgid "Add sidebar button" -msgstr "" +msgstr "Lägg till knapp i sidoramen" #. module: email_template #: view:email.template:0 #: view:email_template.preview:0 msgid "Body (Text)" -msgstr "" +msgstr "Brödtext (Text)" #. module: email_template #: view:email.template:0 @@ -407,18 +427,18 @@ msgstr "" #: field:email.template,copyvalue:0 #: field:email_template.preview,copyvalue:0 msgid "Expression" -msgstr "" +msgstr "Uttryck" #. module: email_template #: field:email.template,original:0 #: field:email_template.preview,original:0 msgid "Original" -msgstr "" +msgstr "Original" #. module: email_template #: view:email.template:0 msgid "Addresses" -msgstr "" +msgstr "Adresser" #. module: email_template #: help:email.template,copyvalue:0 @@ -426,7 +446,7 @@ msgstr "" msgid "" "Final placeholder expression, to be copy-pasted in the desired template " "field." -msgstr "" +msgstr "Slutlig platshållare uttryck, att kopieras till önskad mallfält." #. module: email_template #: view:email.template:0 @@ -436,13 +456,13 @@ msgstr "Bilagor" #. module: email_template #: view:email.template:0 msgid "Email Details" -msgstr "" +msgstr "E-postdetaljer" #. module: email_template #: field:email.template,email_cc:0 #: field:email_template.preview,email_cc:0 msgid "Cc" -msgstr "" +msgstr "Kopia" #. module: email_template #: field:email.template,body_text:0 @@ -455,18 +475,19 @@ msgstr "" #: help:email_template.preview,auto_delete:0 msgid "Permanently delete this email after sending it, to save space" msgstr "" +"Permanent radering av detta meddelande efter leverans, för att spara plats" #. module: email_template #: field:email.template,references:0 #: field:email_template.preview,references:0 msgid "References" -msgstr "" +msgstr "Referenser" #. module: email_template #: field:email.template,display_text:0 #: field:email_template.preview,display_text:0 msgid "Display Text" -msgstr "" +msgstr "Visa text" #. module: email_template #: view:email_template.preview:0 @@ -480,6 +501,8 @@ msgid "" "You may attach files to this template, to be added to all emails created " "from this template" msgstr "" +"Du kan bilägga filer till denna mall, dessa läggs då till all e-post som " +"skapas från denna förlaga" #. module: email_template #: help:email.template,headers:0 @@ -488,12 +511,14 @@ msgid "" "Full message headers, e.g. SMTP session headers (usually available on " "inbound messages only)" msgstr "" +"Fullständigt e-posthuvud, närmare bestämt SMTP-sessionens huvud (vanligtvis " +"tillgängligt endast i inkommande meddelanden)" #. module: email_template #: field:email.template,mail_server_id:0 #: field:email_template.preview,mail_server_id:0 msgid "Outgoing Mail Server" -msgstr "" +msgstr "Utgående e-postserver" #. module: email_template #: help:email.template,ref_ir_act_window:0 @@ -502,6 +527,8 @@ msgid "" "Sidebar action to make this template available on records of the related " "document model" msgstr "" +"Funktioner i sidorutan som gör denna mall tillgänglig för all postser av " +"denna objekttyp" #. module: email_template #: field:email.template,model_object_field:0 @@ -513,7 +540,7 @@ msgstr "Fält" #: field:email.template,user_id:0 #: field:email_template.preview,user_id:0 msgid "Related user" -msgstr "" +msgstr "Relaterad användare" #. module: email_template #: view:email.template:0 @@ -531,7 +558,7 @@ msgstr "" #: help:email.template,email_bcc:0 #: help:email_template.preview,email_bcc:0 msgid "Blind carbon copy recipients (placeholders may be used here)" -msgstr "" +msgstr "Blindkopiemottagarae (platshållare kan användas här)" #. module: email_template #: help:email.template,lang:0 @@ -542,17 +569,20 @@ msgid "" "a placeholder expression that provides the appropriate language code, e.g. " "${object.partner_id.lang.code}." msgstr "" +"Tillval översättningsspråk (ISO-kod) att välja när du skickar ut ett mail. " +"Om inte inställt, kommer den engelska versionen användas. Detta bör " +"vanligtvis vara en platshållaruttryck som ger" #. module: email_template #: field:email_template.preview,res_id:0 msgid "Sample Document" -msgstr "" +msgstr "Exempeldokument" #. module: email_template #: help:email.template,email_to:0 #: help:email_template.preview,email_to:0 msgid "Comma-separated recipient addresses (placeholders may be used here)" -msgstr "" +msgstr "Komma-separerade mottagaradresser (platshållare kan användad)" #. module: email_template #: field:email.template,name:0 @@ -564,17 +594,17 @@ msgstr "Namn" #: field:email.template,track_campaign_item:0 #: field:email_template.preview,track_campaign_item:0 msgid "Resource Tracking" -msgstr "" +msgstr "Resursuppföljning" #. module: email_template #: model:ir.model,name:email_template.model_email_template_preview msgid "Email Template Preview" -msgstr "" +msgstr "Förhandsgranska e-postmall" #. module: email_template #: view:email_template.preview:0 msgid "Email Preview" -msgstr "" +msgstr "Förhandsgranskning e-post" #. module: email_template #: help:email.template,message_id:0 @@ -586,63 +616,69 @@ msgid "" "instead.\n" "Placeholders must be used here, as this value always needs to be unique!" msgstr "" +"Message-ID SMTP huvudet att använda i utgående meddelanden baserat på " +"mallen. Observera att detta åsidosätter \"Resource Tracking alternativet\", " +"så om du bara behöver hålla reda på svar på utgående e-post, aktivera det " +"alternativet istället.\n" +"Platshållare måste användas här, eftersom detta värde alltid måste vara " +"unikt!" #. module: email_template #: field:email.template,headers:0 #: field:email_template.preview,headers:0 msgid "Message headers" -msgstr "" +msgstr "Meddelandehuvud" #. module: email_template #: field:email.template,email_bcc:0 #: field:email_template.preview,email_bcc:0 msgid "Bcc" -msgstr "" +msgstr "Blindkopia" #. module: email_template #: help:email.template,reply_to:0 #: help:email_template.preview,reply_to:0 msgid "Preferred response address (placeholders may be used here)" -msgstr "" +msgstr "Föredragen svarsadress (platshållare kan användas)" #. module: email_template #: view:email.template:0 msgid "Remove sidebar button" -msgstr "" +msgstr "Tag bort sidoramsknappar" #. module: email_template #: help:email.template,null_value:0 #: help:email_template.preview,null_value:0 msgid "Optional value to use if the target field is empty" -msgstr "" +msgstr "Tillvalsvärde att använda då målfältet är tomt" #. module: email_template #: view:email.template:0 msgid "Model" -msgstr "" +msgstr "Model" #. module: email_template #: help:email.template,references:0 #: help:email_template.preview,references:0 msgid "Message references, such as identifiers of previous messages" -msgstr "" +msgstr "Meddelandereference, t ex identifieraren på föregående e-post" #. module: email_template #: help:email.template,ref_ir_value:0 #: help:email_template.preview,ref_ir_value:0 msgid "Sidebar button to open the sidebar action" -msgstr "" +msgstr "Sidorutans knapp för att öppna sidorutans åtgärder" #. module: email_template #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt" #. module: email_template #: code:addons/email_template/email_template.py:218 #, python-format msgid "Deletion of the action record failed." -msgstr "" +msgstr "Radering av åtgärdsposten misslyckades." #. module: email_template #: help:email.template,mail_server_id:0 @@ -651,12 +687,14 @@ msgid "" "Optional preferred server for outgoing mails. If not set, the highest " "priority one will be used." msgstr "" +"Tillvad föredragen server för utgående e-post. Om inte satt, väljs servern " +"med högst prioritet." #. module: email_template #: selection:email.template,state:0 #: selection:email_template.preview,state:0 msgid "Delivery Failed" -msgstr "" +msgstr "Leverans misslyckades" #. module: email_template #: help:email.template,sub_model_object_field:0 @@ -665,23 +703,25 @@ msgid "" "When a relationship field is selected as first field, this field lets you " "select the target field within the destination document model (sub-model)." msgstr "" +"När relationsfältet är första fältet, så låter dig detta fält välja målfält " +"i destinationsobjetet (sub-model)" #. module: email_template #: view:email.template:0 msgid "Attach Report" -msgstr "" +msgstr "Bilägg rapport" #. module: email_template #: field:email.template,report_template:0 #: field:email_template.preview,report_template:0 msgid "Optional report to print and attach" -msgstr "" +msgstr "Tillvald rapport för utskrift och bilaga" #. module: email_template #: help:email.template,body_html:0 #: help:email_template.preview,body_html:0 msgid "Rich-text/HTML version of the message (placeholders may be used here)" -msgstr "" +msgstr "Utsmyckad/HTMÖ-version av meddelandet (platshållare kan användas)" #~ msgid "Permanently delete emails after sending" #~ msgstr "Permanent radera e-post efter att de skickats" @@ -851,3 +891,21 @@ msgstr "" #~ msgid "Null Value" #~ msgstr "Nollvärde" + +#~ msgid "Sidebar button" +#~ msgstr "Knapp i sidoramen" + +#~ msgid "E-mail composition wizard" +#~ msgstr "E-post editor" + +#~ msgid "Related Document model" +#~ msgstr "Modell för relaterade dokument" + +#~ msgid "Rich-text contents" +#~ msgstr "Utsmyckat innehåll" + +#~ msgid "Text contents" +#~ msgstr "Textinnehåll" + +#~ msgid "Opt-out" +#~ msgstr "Valt bort" diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po index 412abfad314..fac9d5fab0b 100644 --- a/addons/email_template/i18n/tr.po +++ b/addons/email_template/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -182,8 +182,8 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "E-posta oluşturma sihirbazı" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -1380,6 +1380,9 @@ msgstr "" #~ "Kimden Epostasında beliritlmemişse, açıklama Epostadan alındığı gibi " #~ "Gönderen Adı olarak kullanılır. Örneğin: John Doe <john@doe.com>" +#~ msgid "E-mail composition wizard" +#~ msgstr "E-posta oluşturma sihirbazı" + #~ msgid "Related Document model" #~ msgstr "İlgili Döküman Modeli" diff --git a/addons/email_template/i18n/zh_CN.po b/addons/email_template/i18n/zh_CN.po index 53b306cfd27..ff558b35113 100644 --- a/addons/email_template/i18n/zh_CN.po +++ b/addons/email_template/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" +"X-Generator: Launchpad (build 15505)\n" #. module: email_template #: field:email.template,subtype:0 @@ -182,8 +182,8 @@ msgstr "内容类型，一般是“html”或“纯文本”，用于对应地 #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" -msgstr "邮件合并向导" +msgid "Email composition wizard" +msgstr "" #. module: email_template #: view:email.template:0 @@ -1358,6 +1358,9 @@ msgstr "消息的富文本/HTML版本（这里可以使用占位符）" #~ msgid "Sidebar button" #~ msgstr "边栏按钮" +#~ msgid "E-mail composition wizard" +#~ msgstr "邮件合并向导" + #~ msgid "Related Document model" #~ msgstr "相关单据模型" diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml index cf233b20682..efe0074b313 100644 --- a/addons/email_template/wizard/email_compose_message_view.xml +++ b/addons/email_template/wizard/email_compose_message_view.xml @@ -9,18 +9,17 @@ <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/> <field name="arch" type="xml"> <data> - <xpath expr="//label[@name='placeholder']" position="before"> + <xpath expr="//form/header/button" position="before"> + <field name="use_template" invisible="1"/> + <button icon="gtk-paste" type="object" name="template_toggle" + string="" help="Use a message template" /> + <button icon="gtk-save" type="object" name="save_as_template" + string="" help="Save as a new template"/> + </xpath> + <xpath expr="//form/notebook" position="after"> <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4"> <field name="template_id" colspan="3" on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/> - <label string="" name="flexspace" colspan="1"/> - </group> - <group colspan="1" col="6"> - <field name="use_template" invisible="1"/> - <button icon="gtk-paste" type="object" name="template_toggle" - string="" help="Use a message template" colspan="1"/> - <button icon="gtk-save" type="object" name="save_as_template" - string="" help="Save as a new template" colspan="1"/> </group> </xpath> </data> diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml index 4aab57396ad..a7c37e9b5a9 100644 --- a/addons/email_template/wizard/email_template_preview_view.xml +++ b/addons/email_template/wizard/email_template_preview_view.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data> + <data> <!-- Email Template Preview --> <record model="ir.ui.view" id="email_template_preview_form"> <field name="name">email_template.preview.form</field> @@ -28,11 +28,6 @@ </notebook> </group> <field name="report_name" colspan="4" readonly="1"/> - <separator colspan="4"/> - <group col="4" colspan="4"> - <label string=""/> - <button icon="gtk-ok" special="cancel" string="Close" colspan="1"/> - </group> </form> </field> </record> @@ -49,5 +44,5 @@ <field name="context">{'template_id':active_id}</field> </record> - </data> + </data> </openerp> |