[MERGE] forward port of branch 8.0 up to 591e329

3 files changed, 719 insertions, 41 deletions

diff --git a/addons/email_template/i18n/lv.po b/addons/email_template/i18n/lv.po
new file mode 100644
index 00000000000..9c799947171
--- /dev/null
+++ b/addons/email_template/i18n/lv.po
@@ -0,0 +1,652 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-10-24 16:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-10-25 07:02+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:365
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (kopija)"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Add"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr "Pievienot parakstu"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Advanced Settings"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Applies to"
+msgstr "Attiecas uz"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Attachments"
+msgstr "Pielikumi"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Author Signature (mass mail only)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "Automātiska dzēšana"
+
+#. module: email_template
+#: view:res.partner:email_template.res_partner_opt_out_search
+msgid "Available for mass mailing"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+#: field:ir.actions.server,body_html:0
+msgid "Body"
+msgstr "Pamatteksts"
+
+#. 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 "CC saņēmēji (šeit var izmantot aizvietotājus)"
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr "CC"
+
+#. module: email_template
+#: view:ir.actions.server:email_template.view_server_action_form_template
+msgid "Choose a template to display its values."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:email_template.email_template_preview_form
+msgid "Choose an example"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Comma-separated carbon copy recipients addresses"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Comma-separated ids of recipient partners"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,partner_to:0
+#: help:email_template.preview,partner_to:0
+msgid ""
+"Comma-separated ids of recipient partners (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Comma-separated recipient addresses"
+msgstr ""
+
+#. 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 ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Content"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Context Action"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,create_uid:0
+#: field:email_template.preview,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,create_date:0
+#: field:email_template.preview,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Default Value"
+msgstr "Noklusētā vērtība"
+
+#. module: email_template
+#: field:email.template,use_default_to:0
+#: field:email_template.preview,use_default_to:0
+msgid "Default recipients"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_default_to:0
+#: help:email_template.preview,use_default_to:0
+msgid ""
+"Default recipients of the record:\n"
+"- partner (using id on a partner or the partner_id field) OR\n"
+"- email (using email_from or email field)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:355
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr "Darbības ieraksta dzēšana neizdevās."
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid ""
+"Display an option on related documents to open a composition wizard with "
+"this template"
+msgstr ""
+"Parādīt uz saistītiem dokumentiem iespēju atvērt uz šo sagatavi balstītu e-"
+"pastu"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Dynamic Placeholder Generator"
+msgstr ""
+
+#. module: email_template
+#: view:ir.actions.server:email_template.view_server_action_form_template
+msgid "Email"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Email Configuration"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:email_template.email_template_preview_form
+msgid "Email Preview"
+msgstr "E-pasta priekšskatījums"
+
+#. module: email_template
+#: field:ir.actions.server,template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "E-pasta sagataves priekšskatījums"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr "E-pasta sagataves"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "E-pasta sastādīšanas vednis"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "Lauks"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr ""
+"Galējā aizvietotāja izteiksme, ievietošanai vajadzīgajā sagataves laukā."
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+#: field:ir.actions.server,email_from:0
+msgid "From"
+msgstr "No"
+
+#. module: email_template
+#: view:email.template:email_template.view_email_template_search
+msgid "Group by..."
+msgstr "Grupēt pēc..."
+
+#. module: email_template
+#: field:email.template,id:0
+#: field:email_template.preview,id:0
+msgid "ID"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr ""
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails for mass "
+"mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
+"users to filter the partners when performing mass mailing."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language"
+msgstr "Valoda"
+
+#. module: email_template
+#: field:email.template,write_uid:0
+#: field:email_template.preview,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,write_date:0
+#: field:email_template.preview,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.view_email_template_search
+msgid "Model"
+msgstr "Modelis"
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr "Nosaukums"
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+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 ""
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "Atrakstīšanas nosacījumi"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr "Iespējama atskaite izdrukai un pievienošanai pielikumā"
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language, e.g. "
+"${object.partner_id.lang}."
+msgstr ""
+
+#. 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 "Noklusējuma vērtība, ko lietot, ja mērķa lauks ir tukšs"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "Izejošā Pasta Serveris"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Override author's email"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: email_template
+#: view:res.partner:email_template.res_partner_opt_out_search
+msgid ""
+"Partners that did not ask not to be included in mass mailing campaigns"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "Neatgriezeniski dzēst šo e-pastu pēc nosūtīšanas, lai taupītu vietu"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Placeholder Expression"
+msgstr "Aizvietotāja izteiksme"
+
+#. module: email_template
+#: view:ir.actions.server:email_template.view_server_action_form_template
+msgid "Please set the Base Model before setting the action details."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Preferred reply address"
+msgstr ""
+
+#. 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 ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Preview"
+msgstr "Priekšskatīt"
+
+#. module: email_template
+#: view:email_template.preview:email_template.email_template_preview_form
+msgid "Preview of"
+msgstr "Priekšskatījums"
+
+#. module: email_template
+#: field:email_template.preview,partner_ids:0
+msgid "Recipients"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr "Saistītais dokumenta modelis"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid "Remove"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+msgid ""
+"Remove the contextual action to use this template on related documents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "Atbildēt"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "Atskaites faila nosaukums"
+
+#. 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 ""
+"Ziņojuma Formatēta teksta/HTML versija (šeit var izmantot aizvietotājus)"
+
+#. module: email_template
+#: view:email.template:email_template.view_email_template_search
+msgid "SMTP Server"
+msgstr "SMTP serveris"
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr "Piemēra dokuments"
+
+#. module: email_template
+#: view:mail.compose.message:email_template.email_compose_message_wizard_inherit_form
+msgid "Save as a new template"
+msgstr "Saglabāt kā jaunu sagatavi"
+
+#. module: email_template
+#: view:mail.compose.message:email_template.email_compose_message_wizard_inherit_form
+msgid "Save as new template"
+msgstr "Saglabāt kā jaunu sagatavi"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:318
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Sūtīt e-pastu (%s)"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid ""
+"Sender address (placeholders may be used here). If not set, the default "
+"value will be the author's email alias if configured, or email address."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:551
+#, python-format
+msgid ""
+"Sender email is missing or empty after template rendering. Specify one to "
+"deliver your message"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr "Sānjoslas poga"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "Sānjoslas darbība"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr ""
+"Sānjoslas darbība, lai padarītu šo sagatavi pieejamu uz saistītā dokumentu "
+"modeļa ierakstiem"
+
+#. 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 "Sānjoslas poga, lai atvērtu sānjoslas darbību"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "Apakšlauks"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr "Apakšmodelis"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+#: field:ir.actions.server,subject:0
+msgid "Subject"
+msgstr "Temats"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "Temats (šeit var lietot aizvietotājus)"
+
+#. module: email_template
+#: view:res.partner:email_template.res_partner_opt_out_search
+msgid "Suppliers"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Sagataves priekšskatījums"
+
+#. module: email_template
+#: view:email.template:email_template.email_template_form
+#: view:email.template:email_template.email_template_tree
+#: view:email.template:email_template.view_email_template_search
+#: 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 "Sagataves"
+
+#. module: email_template
+#: help:email.template,model_id:0
+#: help:email_template.preview,model_id:0
+msgid "The kind of document with with this template can be used"
+msgstr "Dokumenta veids, ar kuru var lietot šo sagatavi"
+
+#. module: email_template
+#: view:ir.actions.server:email_template.view_server_action_form_template
+msgid ""
+"The values displayed hereunder are informative. When sending the email, the "
+"values\n"
+"                                will be taken from the email template."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+#: field:ir.actions.server,email_to:0
+msgid "To (Emails)"
+msgstr "Kam(e-pasti)"
+
+#. module: email_template
+#: field:email.template,partner_to:0
+#: field:email_template.preview,partner_to:0
+#: field:ir.actions.server,partner_to:0
+msgid "To (Partners)"
+msgstr "Kam (partneri)"
+
+#. module: email_template
+#: view:mail.compose.message:email_template.email_compose_message_wizard_inherit_form
+#: field:mail.compose.message,template_id:0
+msgid "Use template"
+msgstr "Lietot sagatavi"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:355
+#, python-format
+msgid "Warning"
+msgstr "Brīdinājums"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:551
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+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 ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr ""
+"Jums jāpievieno pielikumā šai sagatavei failus, kuri tiks pievienoti "
+"pielikumā visām vēstulēm, kas tiks pēc tās izveidotas"
+
+#. module: email_template
+#: view:ir.actions.server:email_template.view_server_action_form_template
+msgid ""
+"Your template does not defined any email_from. Please update your template."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:email_template.email_template_preview_form
+msgid "record:"
+msgstr ""
diff --git a/addons/email_template/i18n/mk.po b/addons/email_template/i18n/mk.po
index e4faa2ecdb5..561d6c2bc1d 100644
--- a/addons/email_template/i18n/mk.po
+++ b/addons/email_template/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-10-28 09:36+0000\n"
+"Last-Translator: Tome Barbov <tome.barbov@eskon.com.mk>\n"
 "Language-Team: Macedonian <mk@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: 2014-08-15 07:06+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-10-29 07:47+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:365
@@ -26,7 +26,7 @@ msgstr "%s (копија)"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Add"
-msgstr ""
+msgstr "Додади"
 
 #. module: email_template
 #: field:email.template,user_signature:0
@@ -37,7 +37,7 @@ msgstr "Додади потпис"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Напредни подесувања"
 
 #. module: email_template
 #: field:email.template,model_id:0
@@ -54,7 +54,7 @@ msgstr "Прилози"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Author Signature (mass mail only)"
-msgstr ""
+msgstr "Потпис на автор (само за групни е-маил пораки)"
 
 #. module: email_template
 #: field:email.template,auto_delete:0
@@ -65,7 +65,7 @@ msgstr "Автоматско бришење"
 #. module: email_template
 #: view:res.partner:email_template.res_partner_opt_out_search
 msgid "Available for mass mailing"
-msgstr ""
+msgstr "Достапно за групно праќање на Е-маил пораки"
 
 #. module: email_template
 #: field:email.template,body_html:0
@@ -89,12 +89,12 @@ msgstr "Копија"
 #. module: email_template
 #: view:ir.actions.server:email_template.view_server_action_form_template
 msgid "Choose a template to display its values."
-msgstr ""
+msgstr "Изберете урнек за да ги видите неговите вредности."
 
 #. module: email_template
 #: view:email_template.preview:email_template.email_template_preview_form
 msgid "Choose an example"
-msgstr ""
+msgstr "Изберете пример"
 
 #. module: email_template
 #: view:email.template:email_template.email_template_form
@@ -104,7 +104,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Comma-separated ids of recipient partners"
-msgstr ""
+msgstr "ID-а на партнери - примачи разделени со запирка"
 
 #. module: email_template
 #: help:email.template,partner_to:0
@@ -118,7 +118,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Comma-separated recipient addresses"
-msgstr ""
+msgstr "Адреси на примачи разделени со запирка"
 
 #. module: email_template
 #: help:email.template,email_to:0
@@ -130,7 +130,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Content"
-msgstr ""
+msgstr "Содржина"
 
 #. module: email_template
 #: view:email.template:email_template.email_template_form
@@ -141,13 +141,13 @@ msgstr ""
 #: field:email.template,create_uid:0
 #: field:email_template.preview,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "Креирано од"
 
 #. module: email_template
 #: field:email.template,create_date:0
 #: field:email_template.preview,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "Креирано на"
 
 #. module: email_template
 #: field:email.template,null_value:0
@@ -159,7 +159,7 @@ msgstr "Стандардна вредност"
 #: field:email.template,use_default_to:0
 #: field:email_template.preview,use_default_to:0
 msgid "Default recipients"
-msgstr ""
+msgstr "Стандардни примачи"
 
 #. module: email_template
 #: help:email.template,use_default_to:0
@@ -169,6 +169,9 @@ msgid ""
 "- partner (using id on a partner or the partner_id field) OR\n"
 "- email (using email_from or email field)"
 msgstr ""
+"Стандардни примачи на записот:\n"
+"- партнер (преку id на партнер или partner_id полето) ИЛИ\n"
+"- е-маил (преку email_from или е-маил полето)"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:355
@@ -193,12 +196,12 @@ msgstr ""
 #. module: email_template
 #: view:ir.actions.server:email_template.view_server_action_form_template
 msgid "Email"
-msgstr ""
+msgstr "Е-маил"
 
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Email Configuration"
-msgstr ""
+msgstr "Конфигурација на е-маил"
 
 #. module: email_template
 #: view:email_template.preview:email_template.email_template_preview_form
@@ -208,7 +211,7 @@ msgstr "Преглед на е-пошта"
 #. module: email_template
 #: field:ir.actions.server,template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "Урнек за е-пошта"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
@@ -256,7 +259,7 @@ msgstr "Групирај по"
 #: field:email.template,id:0
 #: field:email_template.preview,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -275,6 +278,10 @@ msgid ""
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
 "users to filter the partners when performing mass mailing."
 msgstr ""
+"Ако „откажи претплата“ е означено, овој контакт одбил да прима групни е-маил "
+"пораки и маркетиншки кампањи. Филтерот 'достапно за групни пораки' им "
+"дозволува на корисниците да ги филтрират партерите кога испраќаат групни е-"
+"маил пораки."
 
 #. module: email_template
 #: field:email.template,lang:0
@@ -286,13 +293,13 @@ msgstr "Јазик"
 #: field:email.template,write_uid:0
 #: field:email_template.preview,write_uid:0
 msgid "Last Updated by"
-msgstr ""
+msgstr "Последно ажурирање од"
 
 #. module: email_template
 #: field:email.template,write_date:0
 #: field:email_template.preview,write_date:0
 msgid "Last Updated on"
-msgstr ""
+msgstr "Последно ажурирање на"
 
 #. module: email_template
 #: view:email.template:email_template.view_email_template_search
@@ -362,7 +369,7 @@ msgstr "Сервер за излезна пошта"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Override author's email"
-msgstr ""
+msgstr "Замени е-маил на авторот"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
@@ -374,6 +381,7 @@ msgstr "Партнер"
 msgid ""
 "Partners that did not ask not to be included in mass mailing campaigns"
 msgstr ""
+"Партнери кои не побарале да не бидат вклучени во групни е-маил кампањи"
 
 #. module: email_template
 #: help:email.template,auto_delete:0
@@ -393,11 +401,12 @@ msgstr "Резервиран израз"
 #: view:ir.actions.server:email_template.view_server_action_form_template
 msgid "Please set the Base Model before setting the action details."
 msgstr ""
+"Ве молиме одберете го основниот модел пред да подесите детали за акција."
 
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Preferred reply address"
-msgstr ""
+msgstr "Преферирана адреса за одговор"
 
 #. module: email_template
 #: help:email.template,reply_to:0
@@ -419,7 +428,7 @@ msgstr "Преглед на"
 #. module: email_template
 #: field:email_template.preview,partner_ids:0
 msgid "Recipients"
-msgstr ""
+msgstr "Примачи"
 
 #. module: email_template
 #: field:email.template,model:0
@@ -430,7 +439,7 @@ msgstr "Модел на поврзан документ"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Remove"
-msgstr ""
+msgstr "Одстрани"
 
 #. module: email_template
 #: view:email.template:email_template.email_template_form
@@ -512,6 +521,8 @@ msgid ""
 "Sender email is missing or empty after template rendering. Specify one to "
 "deliver your message"
 msgstr ""
+"Нема е-маил адреса на праќач по имплементација на урнекот. Назначете една за "
+"да се прати вашата порака"
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
@@ -571,7 +582,7 @@ msgstr "Предмет (може да содржи резервирани мес
 #. module: email_template
 #: view:res.partner:email_template.res_partner_opt_out_search
 msgid "Suppliers"
-msgstr ""
+msgstr "Добавувачи"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -600,6 +611,9 @@ msgid ""
 "values\n"
 "                                will be taken from the email template."
 msgstr ""
+"Вредностите прикажани овде се од информативен карактер. Кога праќате е-маил, "
+"вредностите\n"
+"                                ќе се земат од урнекот за е-маил."
 
 #. module: email_template
 #: field:email.template,email_to:0
@@ -631,7 +645,7 @@ msgstr "Внимание"
 #: code:addons/email_template/email_template.py:551
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Предупредување!"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -668,8 +682,10 @@ msgstr ""
 msgid ""
 "Your template does not defined any email_from. Please update your template."
 msgstr ""
+"Вашиот урнек нема дефинирано email_from. Ве молиме ажурирајте го вашиот "
+"урнек."
 
 #. module: email_template
 #: view:email_template.preview:email_template.email_template_preview_form
 msgid "record:"
-msgstr ""
+msgstr "запис:"
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index 6bea4dcbcee..adf3d92c530 100644
--- a/addons/email_template/i18n/tr.po
+++ b/addons/email_template/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-09-21 17:21+0000\n"
-"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
+"PO-Revision-Date: 2014-11-01 07:14+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-09-22 08:01+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-02 06:19+0000\n"
+"X-Generator: Launchpad (build 17211)\n"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:365
@@ -54,7 +54,7 @@ msgstr "Ekler"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Author Signature (mass mail only)"
-msgstr ""
+msgstr "Yazanın İmzası (yalnızca toplu postalarda)"
 
 #. module: email_template
 #: field:email.template,auto_delete:0
@@ -89,7 +89,7 @@ msgstr "Cc"
 #. module: email_template
 #: view:ir.actions.server:email_template.view_server_action_form_template
 msgid "Choose a template to display its values."
-msgstr ""
+msgstr "Değerlerini görüntülemek için bir şablon seçin."
 
 #. module: email_template
 #: view:email_template.preview:email_template.email_template_preview_form
@@ -99,7 +99,7 @@ msgstr "Bir örnek seçin"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Comma-separated carbon copy recipients addresses"
-msgstr ""
+msgstr "Virgülle ayrılmış karbon kopya alıcı adresleri"
 
 #. module: email_template
 #: view:email.template:email_template.email_template_form
@@ -158,7 +158,7 @@ msgstr "Varsayılan Değer"
 #: field:email.template,use_default_to:0
 #: field:email_template.preview,use_default_to:0
 msgid "Default recipients"
-msgstr ""
+msgstr "Varsayılan alıcılar"
 
 #. module: email_template
 #: help:email.template,use_default_to:0
@@ -168,6 +168,9 @@ msgid ""
 "- partner (using id on a partner or the partner_id field) OR\n"
 "- email (using email_from or email field)"
 msgstr ""
+"Raporun varsayılan alıcıları:\n"
+"- is ortağı (iş ortağı veya iş ortağı_id alanı kullanılarak) VEYA\n"
+"- eposta (eposta gönderen veya eposta alanı kullanılarak)"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:355
@@ -187,7 +190,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Dynamic Placeholder Generator"
-msgstr ""
+msgstr "Dinamik Yertutucu Oluşturucu"
 
 #. module: email_template
 #: view:ir.actions.server:email_template.view_server_action_form_template
@@ -347,6 +350,9 @@ msgid ""
 "a placeholder expression that provides the appropriate language, e.g. "
 "${object.partner_id.lang}."
 msgstr ""
+"Bir posta gönderirken seçilecek isteğe bağlı çeviri dili (ISO kodu). Eğer "
+"ayarlanmamışsa, ingilizce sürümü kullanılacaktır. Bu genellikle uygun dili "
+"sağlayan bir yrttutucu ifadesidir, örn. ${object.partner_id.lang}."
 
 #. module: email_template
 #: help:email.template,null_value:0
@@ -363,7 +369,7 @@ msgstr "Giden Posta Sunucusu"
 #. module: email_template
 #: view:email.template:email_template.email_template_form
 msgid "Override author's email"
-msgstr ""
+msgstr "Yazarın e-postasını geçersiz kılar."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
@@ -511,7 +517,7 @@ msgstr ""
 msgid ""
 "Sender email is missing or empty after template rendering. Specify one to "
 "deliver your message"
-msgstr ""
+msgstr "Gönderen epostası eksiktir veya şablonun yapılmasından sonra boştur."
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
@@ -598,6 +604,8 @@ msgid ""
 "values\n"
 "                                will be taken from the email template."
 msgstr ""
+"Burada gösterilen değerler bilgi amaçlıdır. Eposta gönderirken, değerle\n"
+"                                eposta şablonundan alınacaktır."
 
 #. module: email_template
 #: field:email.template,email_to:0
@@ -666,8 +674,10 @@ msgstr ""
 msgid ""
 "Your template does not defined any email_from. Please update your template."
 msgstr ""
+"Şablonunuzda tanımlanmış herhangi bir eposta_kimden yok. Lütfen şablonunuzu "
+"güncelleyin."
 
 #. module: email_template
 #: view:email_template.preview:email_template.email_template_preview_form
 msgid "record:"
-msgstr ""
+msgstr "kayıt:"