pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] *: correct typos and bad English

Browse Source 
Courtesy of translators
Reexport .pot of modified modules

closes odoo/odoo#61010

X-original-commit: 62a18bdb372e234107fd2099a2df5f9e3a442c96
Related: odoo/enterprise#14489
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
This commit is contained in:
Martin Trigaux
2020-10-29 19:23:41 +00:00
parent eac3c08ce2
commit c59c10f1bc
63 changed files with 308 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/i18n/mail.pot
+5 -12
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-29 13:45+0000\n"
"PO-Revision-Date: 2020-09-29 13:45+0000\n"
"POT-Creation-Date: 2020-10-29 15:48+0000\n"
"PO-Revision-Date: 2020-10-29 15:48+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -158,13 +158,6 @@ msgstr ""
msgid "<i class=\"fa fa-globe\" aria-label=\"Document url\"/>"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/tours/mail.js:0
#, python-format
msgid "<p> Create a private channel.</p>"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/tours/mail.js:0
@@ -4743,9 +4736,9 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
msgid ""
"This option permanently removes any track of email after send, including "
"from the Technical menu in the Settings, in order to preserve storage space "
"of your Odoo database."
"This option permanently removes any track of email after it's been sent, "
"including from the Technical menu in the Settings, in order to preserve "
"storage space of your Odoo database."
msgstr ""
#. module: mail
addons/mail/models/mail_mail.py
+1 -1
View File
@@ -52,7 +52,7 @@ class MailMail(models.Model):
], 'Status', readonly=True, copy=False, default='outgoing')
auto_delete = fields.Boolean(
'Auto Delete',
help="This option permanently removes any track of email after send, including from the Technical menu in the Settings, in order to preserve storage space of your Odoo database.")
help="This option permanently removes any track of email after it's been sent, including from the Technical menu in the Settings, in order to preserve storage space of your Odoo database.")
failure_reason = fields.Text(
'Failure Reason', readonly=1,
help="Failure reason. This is usually the exception thrown by the email server, stored to ease the debugging of mailing issues.")
addons/mail/models/mail_template.py
+1 -1
View File
@@ -61,7 +61,7 @@ class MailTemplate(models.Model):
scheduled_date = fields.Char('Scheduled Date', help="If set, the queue manager will send the email after the date. If not set, the email will be send as soon as possible. Jinja2 placeholders may be used.")
auto_delete = fields.Boolean(
'Auto Delete', default=True,
help="This option permanently removes any track of email after send, including from the Technical menu in the Settings, in order to preserve storage space of your Odoo database.")
help="This option permanently removes any track of email after it's been sent, including from the Technical menu in the Settings, in order to preserve storage space of your Odoo database.")
# contextual action
ref_ir_act_window = fields.Many2one('ir.actions.act_window', 'Sidebar action', readonly=True, copy=False,
help="Sidebar action to make this template available on records "
addons/mail/static/tests/mail_utils_tests.js
+2 -2
View File
@@ -33,7 +33,7 @@ QUnit.test('add_link utility function', function (assert) {
});
});
QUnit.test('addLink: linkify inside text node (1 occurence)', function (assert) {
QUnit.test('addLink: linkify inside text node (1 occurrence)', function (assert) {
assert.expect(5);
const content = '<p>some text https://somelink.com</p>';
@@ -71,7 +71,7 @@ QUnit.test('addLink: linkify inside text node (1 occurence)', function (assert)
);
});
QUnit.test('addLink: linkify inside text node (2 occurences)', function (assert) {
QUnit.test('addLink: linkify inside text node (2 occurrences)', function (assert) {
assert.expect(4);
// linkify may add some attributes. Since we do not care of their exact
addons/mail/wizard/mail_compose_message.py
+2 -1
View File
@@ -137,7 +137,8 @@ class MailComposer(models.TransientModel):
'wizard_id', 'partner_id', 'Additional Contacts')
# mass mode options
notify = fields.Boolean('Notify followers', help='Notify followers of the document (mass post only)')
auto_delete = fields.Boolean('Delete Emails', help='This option permanently removes any track of email after send, including from the Technical menu in the Settings, in order to preserve storage space of your Odoo database.')
auto_delete = fields.Boolean('Delete Emails',
help='This option permanently removes any track of email after it\'s been sent, including from the Technical menu in the Settings, in order to preserve storage space of your Odoo database.')
auto_delete_message = fields.Boolean('Delete Message Copy', help='Do not keep a copy of the email in the document communication history (mass mailing only)')
mail_server_id = fields.Many2one('ir.mail_server', 'Outgoing mail server')