Merge PR #602 into 12.0

Signed-off-by pedrobaeza
pull/610/head
OCA-git-bot 2020-09-01 10:32:43 +00:00
commit fea18cd635
4 changed files with 5 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# Copyright 2017-2018 Tecnativa - Pedro M. Baeza # Copyright 2017-2020 Tecnativa - Pedro M. Baeza
# Copyright 2018 Tecnativa - Ernesto Tejeda # Copyright 2018 Tecnativa - Ernesto Tejeda
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

View File

@ -21,13 +21,11 @@ msgstr ""
msgid "" msgid ""
"<i class=\"fa fa-info-circle\"/> New sending will be done only to not sent/" "<i class=\"fa fa-info-circle\"/> New sending will be done only to not sent/"
"new recipients. If you want to resend again the mass mailing to already sent " "new recipients. If you want to resend again the mass mailing to already sent "
"recipients, click on <b>Emails Sent</b> smart-button for removing the " "recipients, you have to duplicate this mailing."
"existing record(s)."
msgstr "" msgstr ""
"<i class=\"fa fa-info-circle\"/> El nuevo envío se realizará solo a los " "<i class=\"fa fa-info-circle\"/> El nuevo envío se realizará solo a los "
"destinatarios no enviados/nuevos. Si quiere reenviar otra vez el correo " "destinatarios no enviados/nuevos. Si quiere reenviar otra vez el correo "
"masivo a destinatarios ya enviados, pulse en el botón <b>Correos enviados</" "masivo a destinatarios ya enviados, debe duplicar el envío."
"b> para eliminar el/los registro/s existentes."
#. module: mass_mailing_resend #. module: mass_mailing_resend
#: model:ir.model,name:mass_mailing_resend.model_mail_mass_mailing #: model:ir.model,name:mass_mailing_resend.model_mail_mass_mailing

View File

@ -15,7 +15,7 @@ msgstr ""
#. module: mass_mailing_resend #. module: mass_mailing_resend
#: model_terms:ir.ui.view,arch_db:mass_mailing_resend.view_mail_mass_mailing_form #: model_terms:ir.ui.view,arch_db:mass_mailing_resend.view_mail_mass_mailing_form
msgid "<i class=\"fa fa-info-circle\"/> New sending will be done only to not sent/new recipients. If you want to resend again the mass mailing to already sent recipients, click on <b>Emails Sent</b> smart-button for removing the existing record(s)." msgid "<i class=\"fa fa-info-circle\"/> New sending will be done only to not sent/new recipients. If you want to resend again the mass mailing to already sent recipients, you have to duplicate this mailing."
msgstr "" msgstr ""
#. module: mass_mailing_resend #. module: mass_mailing_resend
@ -33,4 +33,3 @@ msgstr ""
#, python-format #, python-format
msgid "You can't resend a mass mailing that is being sent or in draft state." msgid "You can't resend a mass mailing that is being sent or in draft state."
msgstr "" msgstr ""

View File

@ -15,7 +15,7 @@
<header position="after"> <header position="after">
<div class="oe_form_box_info bg-warning oe_text_center" attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('sent', '=', 0)]}"> <div class="oe_form_box_info bg-warning oe_text_center" attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('sent', '=', 0)]}">
<p> <p>
<i class="fa fa-info-circle"/> New sending will be done only to not sent/new recipients. If you want to resend again the mass mailing to already sent recipients, click on <b>Emails Sent</b> smart-button for removing the existing record(s). <i class="fa fa-info-circle"/> New sending will be done only to not sent/new recipients. If you want to resend again the mass mailing to already sent recipients, you have to duplicate this mailing.
</p> </p>
</div> </div>
</header> </header>