diff options
Diffstat (limited to 'addons')
84 files changed, 602 insertions, 379 deletions
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index d8fdc0127cb..43003e80eed 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 13:33+0000\n" -"PO-Revision-Date: 2020-11-16 13:33+0000\n" +"POT-Creation-Date: 2020-11-27 15:35+0000\n" +"PO-Revision-Date: 2020-11-27 15:35+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -13555,7 +13555,7 @@ msgstr "" #: code:addons/account/models/account_move.py:0 #, python-format msgid "" -"You cannot edit the journal of an account move if it has already a sequence " +"You cannot edit the journal of an account move if it already has a sequence " "number assigned." msgstr "" diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index cf240a5720a..dbaf1e3fc4f 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1807,7 +1807,7 @@ class AccountMove(models.Model): if (move.posted_before and 'journal_id' in vals and move.journal_id.id != vals['journal_id']): raise UserError(_('You cannot edit the journal of an account move if it has been posted once.')) if (move.name and move.name != '/' and 'journal_id' in vals and move.journal_id.id != vals['journal_id']): - raise UserError(_('You cannot edit the journal of an account move if it has already a sequence number assigned.')) + raise UserError(_('You cannot edit the journal of an account move if it already has a sequence number assigned.')) # You can't change the date of a move being inside a locked period. if 'date' in vals and move.date != vals['date']: diff --git a/addons/account_edi/i18n/account_edi.pot b/addons/account_edi/i18n/account_edi.pot index af943a18df7..f981d2bfb63 100644 --- a/addons/account_edi/i18n/account_edi.pot +++ b/addons/account_edi/i18n/account_edi.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-07 07:33+0000\n" -"PO-Revision-Date: 2020-09-07 07:33+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -90,6 +90,12 @@ msgid "EDI : Perform web services operations" msgstr "" #. module: account_edi +#: model_terms:ir.ui.view,arch_db:account_edi.view_move_form_inherit +#: model_terms:ir.ui.view,arch_db:account_edi.view_payment_form_inherit +msgid "EDI Documents" +msgstr "" + +#. module: account_edi #: model:ir.model,name:account_edi.model_account_edi_format msgid "EDI format" msgstr "" diff --git a/addons/account_edi_ubl/i18n/account_edi_ubl.pot b/addons/account_edi_ubl/i18n/account_edi_ubl.pot index e3c15ae477a..03f5788587f 100644 --- a/addons/account_edi_ubl/i18n/account_edi_ubl.pot +++ b/addons/account_edi_ubl/i18n/account_edi_ubl.pot @@ -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-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,6 +16,11 @@ msgstr "" "Plural-Forms: \n" #. module: account_edi_ubl +#: model_terms:ir.ui.view,arch_db:account_edi_ubl.export_ubl_invoice_line +msgid "Discount (" +msgstr "" + +#. module: account_edi_ubl #: model:ir.model.fields,field_description:account_edi_ubl.field_account_edi_format__display_name #: model:ir.model.fields,field_description:account_edi_ubl.field_account_move__display_name msgid "Display Name" diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot index 4e4d057b334..d96dcc4eac0 100644 --- a/addons/account_payment/i18n/account_payment.pot +++ b/addons/account_payment/i18n/account_payment.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-01 07:28+0000\n" -"PO-Revision-Date: 2020-09-01 07:28+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,11 +16,6 @@ msgstr "" "Plural-Forms: \n" #. module: account_payment -#: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_payment -msgid "&times;" -msgstr "" - -#. module: account_payment #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_success msgid "<b>Communication: </b>" msgstr "" @@ -86,11 +81,23 @@ msgstr "" #. module: account_payment #: model_terms:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment msgid "" +"<span class=\"badge badge-pill badge-success\"><i class=\"fa fa-fw fa-" +"check\"/><span class=\"d-none d-md-inline\"> Reversed</span></span>" +msgstr "" + +#. module: account_payment +#: model_terms:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment +msgid "" "<span class=\"badge badge-pill badge-warning\"><span class=\"d-none d-md-" "inline\"> Pending</span></span>" msgstr "" #. module: account_payment +#: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_payment +msgid "Close" +msgstr "" + +#. module: account_payment #: model:ir.model.fields,field_description:account_payment.field_payment_transaction__display_name msgid "Display Name" msgstr "" diff --git a/addons/account_qr_code_sepa/i18n/account_qr_code_sepa.pot b/addons/account_qr_code_sepa/i18n/account_qr_code_sepa.pot index c29fbe36ec4..ceae43f3b98 100644 --- a/addons/account_qr_code_sepa/i18n/account_qr_code_sepa.pot +++ b/addons/account_qr_code_sepa/i18n/account_qr_code_sepa.pot @@ -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-11-27 15:19+0000\n" +"PO-Revision-Date: 2020-11-27 15:19+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -45,6 +45,6 @@ msgstr "" #: code:addons/account_qr_code_sepa/models/res_bank.py:0 #, python-format msgid "" -"The account receiving the payment must have an account horder name or " +"The account receiving the payment must have an account holder name or " "partner name set." msgstr "" diff --git a/addons/account_qr_code_sepa/models/res_bank.py b/addons/account_qr_code_sepa/models/res_bank.py index afd47553cc0..6f97df14e60 100644 --- a/addons/account_qr_code_sepa/models/res_bank.py +++ b/addons/account_qr_code_sepa/models/res_bank.py @@ -48,7 +48,7 @@ class ResPartnerBank(models.Model): def _check_for_qr_code_errors(self, qr_method, amount, currency, debtor_partner, free_communication, structured_communication): if qr_method == 'sct_qr': if not self.acc_holder_name and not self.partner_id.name: - return _("The account receiving the payment must have an account horder name or partner name set.") + return _("The account receiving the payment must have an account holder name or partner name set.") return super()._check_for_qr_code_errors(qr_method, amount, currency, debtor_partner, free_communication, structured_communication) diff --git a/addons/adyen_platforms/i18n/adyen_platforms.pot b/addons/adyen_platforms/i18n/adyen_platforms.pot index a7a29b134bc..f588d2e34c2 100644 --- a/addons/adyen_platforms/i18n/adyen_platforms.pot +++ b/addons/adyen_platforms/i18n/adyen_platforms.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 13:33+0000\n" -"PO-Revision-Date: 2020-11-16 13:33+0000\n" +"POT-Creation-Date: 2020-11-27 15:42+0000\n" +"PO-Revision-Date: 2020-11-27 15:42+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "" #. module: adyen_platforms #: code:addons/adyen_platforms/models/adyen_account.py:0 #, python-format -msgid "A timeout occured whil trying to reach the Adyen proxy." +msgid "A timeout occured while trying to reach the Adyen proxy." msgstr "" #. module: adyen_platforms @@ -134,11 +134,6 @@ msgid "Adyen UUID should be unique" msgstr "" #. module: adyen_platforms -#: model:ir.model,name:adyen_platforms.model_adyen_transaction -msgid "Adyen for Plaforms Transaction" -msgstr "" - -#. module: adyen_platforms #: model:ir.model,name:adyen_platforms.model_adyen_account msgid "Adyen for Platforms Account" msgstr "" @@ -169,6 +164,11 @@ msgid "Adyen for Platforms Shareholder" msgstr "" #. module: adyen_platforms +#: model:ir.model,name:adyen_platforms.model_adyen_transaction +msgid "Adyen for Platforms Transaction" +msgstr "" + +#. module: adyen_platforms #: code:addons/adyen_platforms/models/adyen_account.py:0 #, python-format msgid "Allowed file formats for bank statements are jpeg, jpg, pdf or png" @@ -1206,7 +1206,7 @@ msgstr "" #: code:addons/adyen_platforms/static/src/xml/adyen_account_templates.xml:0 #, python-format msgid "" -"We will notify you when the status of the review changes or if additionnal " +"We will notify you when the status of the review changes, or if additional " "data is required." msgstr "" diff --git a/addons/adyen_platforms/models/adyen_account.py b/addons/adyen_platforms/models/adyen_account.py index 4813c955360..fa03a09d239 100644 --- a/addons/adyen_platforms/models/adyen_account.py +++ b/addons/adyen_platforms/models/adyen_account.py @@ -301,7 +301,7 @@ class AdyenAccount(models.Model): req = requests.post(url_join(url, operation), json=payload, auth=auth, timeout=TIMEOUT) req.raise_for_status() except requests.exceptions.Timeout: - raise UserError(_('A timeout occured whil trying to reach the Adyen proxy.')) + raise UserError(_('A timeout occured while trying to reach the Adyen proxy.')) except Exception as e: raise UserError(_('The Adyen proxy is not reachable, please try again later.')) response = req.json() diff --git a/addons/adyen_platforms/models/adyen_transaction.py b/addons/adyen_platforms/models/adyen_transaction.py index a04d8e33cd2..3cec7a7c406 100644 --- a/addons/adyen_platforms/models/adyen_transaction.py +++ b/addons/adyen_platforms/models/adyen_transaction.py @@ -10,7 +10,7 @@ from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT class AdyenTransaction(models.Model): _name = 'adyen.transaction' - _description = 'Adyen for Plaforms Transaction' + _description = 'Adyen for Platforms Transaction' _order = 'date desc' adyen_account_id = fields.Many2one('adyen.account') diff --git a/addons/adyen_platforms/static/src/xml/adyen_account_templates.xml b/addons/adyen_platforms/static/src/xml/adyen_account_templates.xml index 4bec48cdaa3..f37ba5e9464 100644 --- a/addons/adyen_platforms/static/src/xml/adyen_account_templates.xml +++ b/addons/adyen_platforms/static/src/xml/adyen_account_templates.xml @@ -5,7 +5,7 @@ <div class="alert alert-info"> You can start processing payments as soon as your application is sent.<br/> Payouts will be blocked until your application has been accepted.<br/> - We will notify you when the status of the review changes or if additionnal data is required.<br/> + We will notify you when the status of the review changes, or if additional data is required.<br/> </div> <h3>Submitted data</h3> diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot index 815edf48ea6..6e0f8bee5dd 100644 --- a/addons/base_setup/i18n/base_setup.pot +++ b/addons/base_setup/i18n/base_setup.pot @@ -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-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -281,6 +281,12 @@ msgid "Default Access Rights" msgstr "" #. module: base_setup +#: code:addons/base_setup/models/res_config_settings.py:0 +#, python-format +msgid "Default User Template not found." +msgstr "" + +#. module: base_setup #. openerp-web #: code:addons/base_setup/static/src/xml/res_config_dev_tool.xml:0 #, python-format @@ -363,11 +369,6 @@ msgstr "" #. module: base_setup #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form -msgid "Gengo Translations" -msgstr "" - -#. module: base_setup -#: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Geo Localization" msgstr "" @@ -587,6 +588,11 @@ msgstr "" #. module: base_setup #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form +msgid "Protect your forms from spam and abuse." +msgstr "" + +#. module: base_setup +#: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Send SMS" msgstr "" @@ -631,11 +637,6 @@ msgid "Translate Your Website with Gengo" msgstr "" #. module: base_setup -#: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form -msgid "Translate your website with Gengo" -msgstr "" - -#. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_web_unsplash msgid "Unsplash Image Library" msgstr "" @@ -690,12 +691,6 @@ msgid "more" msgstr "" #. module: base_setup -#: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form -msgid "" -"reCAPTCHA is a free service that protects your website from spam and abuse." -msgstr "" - -#. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_google_recaptcha msgid "reCAPTCHA: Easy on Humans, Hard on Bots" msgstr "" diff --git a/addons/coupon/i18n/coupon.pot b/addons/coupon/i18n/coupon.pot index bdb4ff8f169..4eb6d3007a7 100644 --- a/addons/coupon/i18n/coupon.pot +++ b/addons/coupon/i18n/coupon.pot @@ -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-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1028,7 +1028,7 @@ msgstr "" #. module: coupon #: model:ir.model.fields,help:coupon.field_coupon_program__discount_percentage #: model:ir.model.fields,help:coupon.field_coupon_reward__discount_percentage -msgid "The discount in percentage, between 1 to 100" +msgid "The discount in percentage, between 1 and 100" msgstr "" #. module: coupon diff --git a/addons/coupon/models/coupon_reward.py b/addons/coupon/models/coupon_reward.py index 99dfc1798ed..d5ad92a9196 100644 --- a/addons/coupon/models/coupon_reward.py +++ b/addons/coupon/models/coupon_reward.py @@ -34,7 +34,7 @@ class CouponReward(models.Model): help="Percentage - Entered percentage discount will be provided\n" + "Amount - Entered fixed amount discount will be provided") discount_percentage = fields.Float(string="Discount", default=10, - help='The discount in percentage, between 1 to 100') + help='The discount in percentage, between 1 and 100') discount_apply_on = fields.Selection([ ('on_order', 'On Order'), ('cheapest_product', 'On Cheapest Product'), diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index fb6ecfc979b..742d9cf8272 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -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-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -477,12 +477,6 @@ msgid "Bounce" msgstr "" #. module: crm -#: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form -msgid "" -"Use this button to update the probabilities of all leads. This can take up to several minutes depending on how many there are." -msgstr "" - -#. module: crm #: code:addons/crm/models/crm_lead.py:0 #, python-format msgid "" @@ -654,6 +648,11 @@ msgid "Congrats, best of luck catching such big fish! :)" msgstr "" #. module: crm +#: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form +msgid "Consider leads created as of the" +msgstr "" + +#. module: crm #: model:ir.model,name:crm.model_res_partner msgid "Contact" msgstr "" @@ -2664,11 +2663,6 @@ msgid "" msgstr "" #. module: crm -#: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form -msgid "Consider leads created as of the" -msgstr "" - -#. module: crm #: model_terms:ir.actions.act_window,help:crm.crm_activity_report_action #: model_terms:ir.actions.act_window,help:crm.crm_activity_report_action_team msgid "Start scheduling activities on your opportunities" @@ -3050,6 +3044,13 @@ msgid "" msgstr "" #. module: crm +#: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form +msgid "" +"Use this button to update the probabilities of all leads. This can take up " +"to several minutes depending on how many there are." +msgstr "" + +#. module: crm #: model:ir.model.fields,help:crm.field_crm_lead__user_login msgid "Used to log into the system" msgstr "" diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 4305dddc10e..20a6dd0e965 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-29 15:48+0000\n" -"PO-Revision-Date: 2020-10-29 15:48+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1969,7 +1969,7 @@ msgstr "" #. openerp-web #: code:addons/event/static/src/js/tours/event_tour.js:0 #, python-format -msgid "Let's <b>create</b> your first event." +msgid "Let's create your first <b>event</b>." msgstr "" #. module: event @@ -2571,6 +2571,11 @@ msgid "Seats Limit" msgstr "" #. module: event +#: model:event.type,name:event.event_type_data_ticket +msgid "Sell Online" +msgstr "" + +#. module: event #: model_terms:ir.ui.view,arch_db:event.res_config_settings_view_form msgid "Sell tickets on your website" msgstr "" @@ -2890,7 +2895,6 @@ msgid "" msgstr "" #. module: event -#: model:event.type,name:event.event_type_data_ticket #: model:ir.model.fields,field_description:event.field_event_type__use_ticket msgid "Ticketing" msgstr "" diff --git a/addons/google_calendar/i18n/google_calendar.pot b/addons/google_calendar/i18n/google_calendar.pot index b7a0988b988..e76e934fbf7 100644 --- a/addons/google_calendar/i18n/google_calendar.pot +++ b/addons/google_calendar/i18n/google_calendar.pot @@ -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-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -61,11 +61,6 @@ msgid "" msgstr "" #. module: google_calendar -#: model_terms:ir.ui.view,arch_db:google_calendar.view_users_form -msgid "Calendar" -msgstr "" - -#. module: google_calendar #: model:ir.model,name:google_calendar.model_calendar_event msgid "Calendar Event" msgstr "" @@ -165,6 +160,11 @@ msgid "Event Recurrence Rule" msgstr "" #. module: google_calendar +#: model_terms:ir.ui.view,arch_db:google_calendar.view_users_form +msgid "Google Calendar" +msgstr "" + +#. module: google_calendar #: model:ir.actions.act_window,name:google_calendar.google_calendar_reset_account_action #: model:ir.model,name:google_calendar.model_google_calendar_account_reset msgid "Google Calendar Account Reset" diff --git a/addons/google_calendar/views/res_users_views.xml b/addons/google_calendar/views/res_users_views.xml index 1cbbc61517e..dad5c5f92d0 100644 --- a/addons/google_calendar/views/res_users_views.xml +++ b/addons/google_calendar/views/res_users_views.xml @@ -7,7 +7,7 @@ <field name="inherit_id" ref="base.view_users_form"/> <field name="arch" type="xml"> <notebook colspan="4" position="inside"> - <page string="Calendar" name="calendar" groups="base.group_system"> + <page string="Google Calendar" name="calendar" groups="base.group_system"> <group class="text-break"> <field name="google_calendar_rtoken" readonly="1"/> <field name="google_calendar_token" readonly="1"/> diff --git a/addons/hr_holidays/data/hr_holidays_demo.xml b/addons/hr_holidays/data/hr_holidays_demo.xml index 70d9b9bc1e2..33f3d007fcb 100644 --- a/addons/hr_holidays/data/hr_holidays_demo.xml +++ b/addons/hr_holidays/data/hr_holidays_demo.xml @@ -8,7 +8,7 @@ <!--Leave Type--> <record id="hr_holiday_status_dv" model="hr.leave.type"> - <field name="name">Parental Time Off</field> + <field name="name">Parental Leaves</field> <field name="allocation_type">fixed</field> <field name="color_name">brown</field> <field name="leave_validation_type">both</field> @@ -132,7 +132,7 @@ </record> <record id="hr_holidays_allocation_pl_al" model="hr.leave.allocation"> - <field name="name">Parental Time Off</field> + <field name="name">Parental Leaves</field> <field name="holiday_status_id" ref="hr_holiday_status_dv"/> <field name="number_of_days">10</field> <field name="employee_id" ref="hr.employee_al"/> diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index d2a805c8f51..62cc0887314 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 10:35+0000\n" -"PO-Revision-Date: 2020-11-17 10:35+0000\n" +"POT-Creation-Date: 2020-11-27 15:27+0000\n" +"PO-Revision-Date: 2020-11-27 15:27+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -874,7 +874,7 @@ msgstr "" #, python-format msgid "" "Allocation request state must be \"Refused\" or \"To Approve\" in order to " -"reset to Draft." +"be reset to Draft." msgstr "" #. module: hr_holidays @@ -1654,7 +1654,9 @@ msgstr "" #. module: hr_holidays #: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_has_error +#: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_has_sms_error #: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_has_error +#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -2261,7 +2263,7 @@ msgstr "" #. module: hr_holidays #: model:hr.leave.type,name:hr_holidays.hr_holiday_status_dv -msgid "Parental Time Off" +msgid "Parental Leaves" msgstr "" #. module: hr_holidays @@ -2424,6 +2426,12 @@ msgid "Run until" msgstr "" #. module: hr_holidays +#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_has_sms_error +#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_has_sms_error +msgid "SMS Delivery error" +msgstr "" + +#. module: hr_holidays #: model_terms:ir.ui.view,arch_db:hr_holidays.hr_leave_view_form_dashboard_new_time_off msgid "Save" msgstr "" @@ -2645,7 +2653,7 @@ msgstr "" #. module: hr_holidays #: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__second_approver_id msgid "" -"This area is automaticly filled by the user who validates the allocation " +"This area is automatically filled by the user who validates the allocation " "with second level (If allocation type need second validation)" msgstr "" @@ -2671,7 +2679,8 @@ msgstr "" #: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__responsible_id msgid "" "This user will be responsible for approving this type of time off. This is " -"only used when validation is 'hr' or 'both'" +"only used when validation is 'By Time Off Officer' or 'By Employee's Manager" +" and Time Off Officer'" msgstr "" #. module: hr_holidays diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index 82266cc7ea5..f0b65351fcc 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -88,7 +88,7 @@ class HolidaysAllocation(models.Model): help='This area is automatically filled by the user who validates the allocation') second_approver_id = fields.Many2one( 'hr.employee', string='Second Approval', readonly=True, copy=False, - help='This area is automaticly filled by the user who validates the allocation with second level (If allocation type need second validation)') + help='This area is automatically filled by the user who validates the allocation with second level (If allocation type need second validation)') validation_type = fields.Selection(string='Validation Type', related='holiday_status_id.allocation_validation_type', readonly=True) can_reset = fields.Boolean('Can reset', compute='_compute_can_reset') can_approve = fields.Boolean('Can Approve', compute='_compute_can_approve') @@ -484,7 +484,7 @@ class HolidaysAllocation(models.Model): def action_draft(self): if any(holiday.state not in ['confirm', 'refuse'] for holiday in self): - raise UserError(_('Allocation request state must be "Refused" or "To Approve" in order to reset to Draft.')) + raise UserError(_('Allocation request state must be "Refused" or "To Approve" in order to be reset to Draft.')) self.write({ 'state': 'draft', 'first_approver_id': False, diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py index 48baf174ab6..e0687b1c135 100644 --- a/addons/hr_holidays/models/hr_leave_type.py +++ b/addons/hr_holidays/models/hr_leave_type.py @@ -74,7 +74,7 @@ class HolidaysType(models.Model): responsible_id = fields.Many2one('res.users', 'Responsible', domain=lambda self: [('groups_id', 'in', self.env.ref('hr_holidays.group_hr_holidays_user').id)], help="This user will be responsible for approving this type of time off. " - "This is only used when validation is 'hr' or 'both'",) + "This is only used when validation is 'By Time Off Officer' or 'By Employee's Manager and Time Off Officer'",) leave_validation_type = fields.Selection([ ('no_validation', 'No Validation'), ('hr', 'By Time Off Officer'), diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot index fe9310b2f3e..ebff21c9f28 100644 --- a/addons/im_livechat/i18n/im_livechat.pot +++ b/addons/im_livechat/i18n/im_livechat.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 10:35+0000\n" -"PO-Revision-Date: 2020-11-17 10:35+0000\n" +"POT-Creation-Date: 2020-11-27 15:41+0000\n" +"PO-Revision-Date: 2020-11-27 15:41+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -574,7 +574,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form msgid "" "For websites built with the Odoo CMS, go to Website > Configuration > " -"Settings and select the Website Live Chat Channel you want to add on your " +"Settings and select the Website Live Chat Channel you want to add to your " "website." msgstr "" diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml index 779213fd81b..8604a205a33 100644 --- a/addons/im_livechat/views/im_livechat_channel_views.xml +++ b/addons/im_livechat/views/im_livechat_channel_views.xml @@ -170,7 +170,7 @@ or copy this url and send it by email to your customers or suppliers: </p> <field name="web_page" readonly="1" widget="CopyClipboardChar"/> - <p>For websites built with the Odoo CMS, go to Website > Configuration > Settings and select the Website Live Chat Channel you want to add on your website.</p> + <p>For websites built with the Odoo CMS, go to Website > Configuration > Settings and select the Website Live Chat Channel you want to add to your website.</p> </div> </group> </page> diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index cbf4b7a7b35..ca48e63d76d 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 10:35+0000\n" -"PO-Revision-Date: 2020-11-17 10:35+0000\n" +"POT-Creation-Date: 2020-11-27 11:23+0000\n" +"PO-Revision-Date: 2020-11-27 11:23+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -790,7 +790,7 @@ msgstr "" #: code:addons/mail/wizard/mail_resend_cancel.py:0 #, python-format msgid "" -"Are you sure you want to discard %s mail delivery failures. You won't be " +"Are you sure you want to discard %s mail delivery failures? You won't be " "able to re-send these mails later!" msgstr "" diff --git a/addons/mail/wizard/mail_resend_cancel.py b/addons/mail/wizard/mail_resend_cancel.py index 1d3adad39aa..dfeef29625c 100644 --- a/addons/mail/wizard/mail_resend_cancel.py +++ b/addons/mail/wizard/mail_resend_cancel.py @@ -14,7 +14,7 @@ class MailResendCancel(models.TransientModel): @api.depends('model') def _compute_help_message(self): for wizard in self: - wizard.help_message = _("Are you sure you want to discard %s mail delivery failures. You won't be able to re-send these mails later!") % (wizard._context.get('unread_counter')) + wizard.help_message = _("Are you sure you want to discard %s mail delivery failures? You won't be able to re-send these mails later!") % (wizard._context.get('unread_counter')) def cancel_resend_action(self): author_id = self.env.user.partner_id.id diff --git a/addons/mail_bot/i18n/mail_bot.pot b/addons/mail_bot/i18n/mail_bot.pot index a7872ea6a07..c62289f0791 100644 --- a/addons/mail_bot/i18n/mail_bot.pot +++ b/addons/mail_bot/i18n/mail_bot.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-01 07:29+0000\n" -"PO-Revision-Date: 2020-09-01 07:29+0000\n" +"POT-Creation-Date: 2020-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -235,8 +235,8 @@ msgstr "" #: code:addons/mail_bot/models/mail_bot.py:0 #, python-format msgid "" -"Wow you are a natural!<br/>Ping someone to grab its attention with " -"@username. <b>Try to ping me using</b> <span " +"Wow you are a natural!<br/>Ping someone with @username to grab their " +"attention. <b>Try to ping me using</b> <span " "class=\"o_odoobot_command\">@OdooBot</span> in a sentence." msgstr "" diff --git a/addons/mail_bot/models/mail_bot.py b/addons/mail_bot/models/mail_bot.py index 8432fa51092..a548647ebff 100644 --- a/addons/mail_bot/models/mail_bot.py +++ b/addons/mail_bot/models/mail_bot.py @@ -44,7 +44,7 @@ class MailBot(models.AbstractModel): elif odoobot_state == 'onboarding_command' and command == 'help': self.env.user.odoobot_state = "onboarding_ping" self.env.user.odoobot_failed = False - return _("Wow you are a natural!<br/>Ping someone to grab its attention with @username. <b>Try to ping me using</b> <span class=\"o_odoobot_command\">@OdooBot</span> in a sentence.") + return _("Wow you are a natural!<br/>Ping someone with @username to grab their attention. <b>Try to ping me using</b> <span class=\"o_odoobot_command\">@OdooBot</span> in a sentence.") elif odoobot_state == 'onboarding_ping' and self._is_bot_pinged(values): self.env.user.odoobot_state = "onboarding_attachement" self.env.user.odoobot_failed = False diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 9587eb48d2a..e894fce6158 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -58,7 +58,7 @@ <record id="mass_mail_1" model="mailing.mailing"> <field name="name">Newsletter 1</field> - <field name="subject" eval="'%s Newsletter' % (DateTime.today().strftime('%B'))"/> + <field name="subject">Monthly Newsletter</field> <field name="state">done</field> <field name="user_id" ref="base.user_admin"/> <field name="email_from">info@yourcompany.example.com</field> diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot index 5d6a1dc97e1..9e9a8239571 100644 --- a/addons/mass_mailing/i18n/mass_mailing.pot +++ b/addons/mass_mailing/i18n/mass_mailing.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-02 14:11+0000\n" -"PO-Revision-Date: 2020-10-02 14:11+0000\n" +"POT-Creation-Date: 2020-11-27 14:29+0000\n" +"PO-Revision-Date: 2020-11-27 14:29+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1683,6 +1683,11 @@ msgid "Messages" msgstr "" #. module: mass_mailing +#: model:mailing.mailing,subject:mass_mailing.mass_mail_1 +msgid "Monthly Newsletter" +msgstr "" + +#. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table msgid "More" msgstr "" @@ -1848,12 +1853,6 @@ msgid "OPENED" msgstr "" #. module: mass_mailing -#: model:mailing.mailing,sms_subject:mass_mailing.mass_mail_1 -#: model:mailing.mailing,subject:mass_mailing.mass_mail_1 -msgid "October Newsletter" -msgstr "" - -#. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.layout msgid "Odoo" msgstr "" @@ -2203,14 +2202,6 @@ msgid "Scheduled on #{record.schedule_date.value}" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mailing_contact.py:0 -#, python-format -msgid "" -"Search opt out cannot be executed without a unique and valid active mailing " -"list context." -msgstr "" - -#. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.email_designer_snippets msgid "Select a template" msgstr "" diff --git a/addons/mass_mailing_sms/i18n/mass_mailing_sms.pot b/addons/mass_mailing_sms/i18n/mass_mailing_sms.pot index 2cf7dffb2ab..29659901a89 100644 --- a/addons/mass_mailing_sms/i18n/mass_mailing_sms.pot +++ b/addons/mass_mailing_sms/i18n/mass_mailing_sms.pot @@ -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-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -287,8 +287,8 @@ msgstr "" #. module: mass_mailing_sms #: model:ir.model.fields,help:mass_mailing_sms.field_mailing_mailing__sms_subject msgid "" -"For an Email, Subject your Recipients will see in their inbox.\n" -"For an SMS Text Message, internal Title of the Message." +"For an email, the subject your recipients will see in their inbox.\n" +"For an SMS, the internal title of the message." msgstr "" #. module: mass_mailing_sms diff --git a/addons/mass_mailing_sms/models/mailing_mailing.py b/addons/mass_mailing_sms/models/mailing_mailing.py index ee1c11e20db..a0b938dbb04 100644 --- a/addons/mass_mailing_sms/models/mailing_mailing.py +++ b/addons/mass_mailing_sms/models/mailing_mailing.py @@ -30,8 +30,8 @@ class Mailing(models.Model): # otherwise 'sms_subject' will get the old helper from 'mass_mailing' module. # overriding 'subject' field helper in this model is not working, since the helper will keep the new value # even when 'mass_mailing_sms' removed (see 'mailing_mailing_view_form_sms' for more details). - sms_subject = fields.Char('Title', help='For an Email, Subject your Recipients will see in their inbox.\n' - 'For an SMS Text Message, internal Title of the Message.', + sms_subject = fields.Char('Title', help='For an email, the subject your recipients will see in their inbox.\n' + 'For an SMS, the internal title of the message.', related='subject', translate=True, readonly=False) # sms options body_plaintext = fields.Text('SMS Body', compute='_compute_body_plaintext', store=True, readonly=False) diff --git a/addons/microsoft_calendar/i18n/microsoft_calendar.pot b/addons/microsoft_calendar/i18n/microsoft_calendar.pot index 0bc1f49b67a..efa15062d5e 100644 --- a/addons/microsoft_calendar/i18n/microsoft_calendar.pot +++ b/addons/microsoft_calendar/i18n/microsoft_calendar.pot @@ -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-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -62,11 +62,6 @@ msgid "" msgstr "" #. module: microsoft_calendar -#: model_terms:ir.ui.view,arch_db:microsoft_calendar.view_users_form -msgid "Calendar" -msgstr "" - -#. module: microsoft_calendar #: model:ir.model,name:microsoft_calendar.model_calendar_event msgid "Calendar Event" msgstr "" @@ -252,6 +247,11 @@ msgid "Notification" msgstr "" #. module: microsoft_calendar +#: model_terms:ir.ui.view,arch_db:microsoft_calendar.view_users_form +msgid "Outlook Calendar" +msgstr "" + +#. module: microsoft_calendar #: model:ir.actions.server,name:microsoft_calendar.ir_cron_sync_all_cals_ir_actions_server #: model:ir.cron,cron_name:microsoft_calendar.ir_cron_sync_all_cals #: model:ir.cron,name:microsoft_calendar.ir_cron_sync_all_cals diff --git a/addons/microsoft_calendar/views/res_users_views.xml b/addons/microsoft_calendar/views/res_users_views.xml index 9b404dc5bfe..6e1d04e926b 100644 --- a/addons/microsoft_calendar/views/res_users_views.xml +++ b/addons/microsoft_calendar/views/res_users_views.xml @@ -7,7 +7,7 @@ <field name="inherit_id" ref="base.view_users_form"/> <field name="arch" type="xml"> <notebook colspan="4" position="inside"> - <page string="Calendar" name="calendar" groups="base.group_system"> + <page string="Outlook Calendar" name="calendar" groups="base.group_system"> <group> <field name="microsoft_calendar_rtoken" readonly="1"/> <field name="microsoft_calendar_token" readonly="1"/> diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot index 22e7462ce17..8f11eef83fe 100644 --- a/addons/payment/i18n/payment.pot +++ b/addons/payment/i18n/payment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-29 15:48+0000\n" -"PO-Revision-Date: 2020-10-29 15:48+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,11 +26,6 @@ msgid "# of Invoices" msgstr "" #. module: payment -#: model_terms:ir.ui.view,arch_db:payment.payment_confirmation_status -msgid "&times;" -msgstr "" - -#. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction__html_3ds msgid "3D Secure HTML" msgstr "" @@ -98,13 +93,6 @@ msgid "<i class=\"fa fa-trash\"/> Delete" msgstr "" #. module: payment -#. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:0 -#, python-format -msgid "This card is currently linked to the following records:" -msgstr "" - -#. module: payment #: model_terms:ir.ui.view,arch_db:payment.payment_tokens_list msgid "<small class=\"text-muted\">(Some fees may apply)</small>" msgstr "" @@ -336,7 +324,7 @@ msgstr "" #. module: payment #: model:payment.acquirer,name:payment.payment_acquirer_authorize -msgid "Authorize.net" +msgid "Authorize.Net" msgstr "" #. module: payment @@ -1268,7 +1256,6 @@ msgstr "" #. module: payment #: model:ir.model.fields.selection,name:payment.selection__payment_acquirer_onboarding_wizard__payment_method__paypal #: model:ir.model.fields.selection,name:payment.selection__res_company__payment_onboarding_payment_method__paypal -#: model:payment.acquirer,name:payment.payment_acquirer_paypal msgid "PayPal" msgstr "" @@ -1427,6 +1414,11 @@ msgid "Payments received" msgstr "" #. module: payment +#: model:payment.acquirer,name:payment.payment_acquirer_paypal +msgid "Paypal" +msgstr "" + +#. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__paypal_user_type msgid "Paypal User Type" msgstr "" @@ -1774,6 +1766,13 @@ msgid "" msgstr "" #. module: payment +#. openerp-web +#: code:addons/payment/static/src/js/payment_form.js:0 +#, python-format +msgid "This card is currently linked to the following records:" +msgstr "" + +#. module: payment #: model:ir.model.fields,help:payment.field_payment_icon__image msgid "" "This field holds the image used for this payment icon, limited to " @@ -1918,12 +1917,6 @@ msgstr "" #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:0 -#, python-format -msgid "We are not able to add your payment method at the moment." -msgstr "" - -#. module: payment -#. openerp-web #: code:addons/payment/static/src/js/payment_form.js:0 #, python-format msgid "We are not able to add your payment method at the moment." diff --git a/addons/payment_odoo_by_adyen/i18n/payment_odoo_by_adyen.pot b/addons/payment_odoo_by_adyen/i18n/payment_odoo_by_adyen.pot new file mode 100644 index 00000000000..8737df49df9 --- /dev/null +++ b/addons/payment_odoo_by_adyen/i18n/payment_odoo_by_adyen.pot @@ -0,0 +1,124 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * payment_odoo_by_adyen +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: payment_odoo_by_adyen +#: code:addons/payment_odoo_by_adyen/models/payment.py:0 +#, python-format +msgid "; multiple order found" +msgstr "" + +#. module: payment_odoo_by_adyen +#: code:addons/payment_odoo_by_adyen/models/payment.py:0 +#, python-format +msgid "; no order found" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_acquirer__odoo_adyen_account_id +msgid "Adyen Account" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_acquirer__odoo_adyen_payout_id +msgid "Adyen Payout" +msgstr "" + +#. module: payment_odoo_by_adyen +#: code:addons/payment_odoo_by_adyen/models/payment.py:0 +#, python-format +msgid "Card No XXXXXXXXXXXX%s" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model_terms:ir.ui.view,arch_db:payment_odoo_by_adyen.acquirer_form_odoo_by_adyen +msgid "Create an account in 1 minute" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_acquirer__display_name +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_token__display_name +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_transaction__display_name +msgid "Display Name" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_acquirer__id +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_token__id +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_transaction__id +msgid "ID" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_acquirer____last_update +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_token____last_update +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_transaction____last_update +msgid "Last Modified on" +msgstr "" + +#. module: payment_odoo_by_adyen +#: code:addons/payment_odoo_by_adyen/models/payment.py:0 +#, python-format +msgid "Odoo Payment by Adyen: feedback error" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields.selection,name:payment_odoo_by_adyen.selection__payment_acquirer__provider__odoo_adyen +msgid "Odoo Payments by Adyen" +msgstr "" + +#. module: payment_odoo_by_adyen +#: code:addons/payment_odoo_by_adyen/models/payment.py:0 +#, python-format +msgid "Odoo Payments by Adyen is not available in test mode." +msgstr "" + +#. module: payment_odoo_by_adyen +#: code:addons/payment_odoo_by_adyen/models/payment.py:0 +#, python-format +msgid "Odoo Payments by Adyen: received data for reference %s" +msgstr "" + +#. module: payment_odoo_by_adyen +#: code:addons/payment_odoo_by_adyen/models/payment.py:0 +#, python-format +msgid "Odoo Payments by Adyen: received data with missing reference (%s)" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model,name:payment_odoo_by_adyen.model_payment_acquirer +msgid "Payment Acquirer" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model,name:payment_odoo_by_adyen.model_payment_token +msgid "Payment Token" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model,name:payment_odoo_by_adyen.model_payment_transaction +msgid "Payment Transaction" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_token__odoo_adyen_payment_method_type +msgid "PaymentMethod Type" +msgstr "" + +#. module: payment_odoo_by_adyen +#: model:ir.model.fields,field_description:payment_odoo_by_adyen.field_payment_acquirer__provider +msgid "Provider" +msgstr "" diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index 57049deb16e..1896b0e7f0f 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 13:33+0000\n" -"PO-Revision-Date: 2020-11-16 13:33+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1475,6 +1475,12 @@ msgid "Difference" msgstr "" #. module: point_of_sale +#: code:addons/point_of_sale/models/pos_session.py:0 +#, python-format +msgid "Difference at closing PoS session" +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_session__cash_register_difference msgid "" "Difference between the theoretical closing balance and the real closing " diff --git a/addons/pos_adyen/i18n/pos_adyen.pot b/addons/pos_adyen/i18n/pos_adyen.pot index ec0e1d97a4a..fda448bf991 100644 --- a/addons/pos_adyen/i18n/pos_adyen.pot +++ b/addons/pos_adyen/i18n/pos_adyen.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-02 14:11+0000\n" -"PO-Revision-Date: 2020-10-02 14:11+0000\n" +"POT-Creation-Date: 2020-11-27 15:29+0000\n" +"PO-Revision-Date: 2020-11-27 15:29+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -97,17 +97,17 @@ msgstr "" #. module: pos_adyen #: model:ir.model,name:pos_adyen.model_adyen_account -msgid "Adyen for Plaforms Account" +msgid "Adyen for Platforms Account" msgstr "" #. module: pos_adyen #: model:ir.model,name:pos_adyen.model_adyen_store -msgid "Adyen for Plaforms Store" +msgid "Adyen for Platforms Store" msgstr "" #. module: pos_adyen #: model:ir.model,name:pos_adyen.model_adyen_terminal -msgid "Adyen for Plaforms Terminal" +msgid "Adyen for Platforms Terminal" msgstr "" #. module: pos_adyen diff --git a/addons/pos_adyen/models/adyen_account.py b/addons/pos_adyen/models/adyen_account.py index 533725a6933..e6621b4a03d 100644 --- a/addons/pos_adyen/models/adyen_account.py +++ b/addons/pos_adyen/models/adyen_account.py @@ -35,7 +35,7 @@ class AdyenAccount(models.Model): class AdyenStore(models.Model): _name = 'adyen.store' _inherit = ['adyen.address.mixin'] - _description = 'Adyen for Plaforms Store' + _description = 'Adyen for Platforms Store' adyen_account_id = fields.Many2one('adyen.account', ondelete='cascade') store_reference = fields.Char('Reference', default=lambda self: uuid.uuid4().hex) @@ -87,7 +87,7 @@ class AdyenStore(models.Model): class AdyenTerminal(models.Model): _name = 'adyen.terminal' - _description = 'Adyen for Plaforms Terminal' + _description = 'Adyen for Platforms Terminal' _rec_name = 'terminal_uuid' adyen_account_id = fields.Many2one('adyen.account', ondelete='cascade') diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot index 3ba650edf0a..50d16fd3519 100644 --- a/addons/pos_restaurant/i18n/pos_restaurant.pot +++ b/addons/pos_restaurant/i18n/pos_restaurant.pot @@ -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-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -517,6 +517,13 @@ msgid "Guests ?" msgstr "" #. module: pos_restaurant +#. openerp-web +#: code:addons/pos_restaurant/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml:0 +#, python-format +msgid "Guests:" +msgstr "" + +#. module: pos_restaurant #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table__height msgid "Height" msgstr "" @@ -1395,6 +1402,13 @@ msgstr "" #. module: pos_restaurant #. openerp-web +#: code:addons/pos_restaurant/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml:0 +#, python-format +msgid "at table" +msgstr "" + +#. module: pos_restaurant +#. openerp-web #: code:addons/pos_restaurant/static/src/xml/Screens/FloorScreen/FloorScreen.xml:0 #, python-format msgid "button in the editing toolbar to create new tables." diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index 16fcc6f186a..dc54316c63d 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -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:46+0000\n" -"PO-Revision-Date: 2020-09-29 13:46+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -552,7 +552,7 @@ msgstr "" #. module: product #: model:product.product,name:product.product_product_13 #: model:product.template,name:product.product_product_13_product_template -msgid "Corner Desk Black" +msgid "Corner Desk Left Sit" msgstr "" #. module: product @@ -800,6 +800,7 @@ msgstr "" #: model:ir.model.fields,field_description:product.field_res_config_settings__display_name #: model:ir.model.fields,field_description:product.field_res_country_group__display_name #: model:ir.model.fields,field_description:product.field_res_partner__display_name +#: model:ir.model.fields,field_description:product.field_uom_uom__display_name msgid "Display Name" msgstr "" @@ -1021,6 +1022,7 @@ msgstr "" #: model:ir.model.fields,field_description:product.field_res_config_settings__id #: model:ir.model.fields,field_description:product.field_res_country_group__id #: model:ir.model.fields,field_description:product.field_res_partner__id +#: model:ir.model.fields,field_description:product.field_uom_uom__id msgid "ID" msgstr "" @@ -1236,6 +1238,7 @@ msgstr "" #: model:ir.model.fields,field_description:product.field_res_config_settings____last_update #: model:ir.model.fields,field_description:product.field_res_country_group____last_update #: model:ir.model.fields,field_description:product.field_res_partner____last_update +#: model:ir.model.fields,field_description:product.field_uom_uom____last_update msgid "Last Modified on" msgstr "" @@ -1856,6 +1859,11 @@ msgid "Product Type" msgstr "" #. module: product +#: model:ir.model,name:product.model_uom_uom +msgid "Product Unit of Measure" +msgstr "" + +#. module: product #: model:ir.model.fields,field_description:product.field_product_pricelist_item__product_id #: model:ir.model.fields,field_description:product.field_product_supplierinfo__product_id #: model:ir.model.fields.selection,name:product.selection__product_pricelist_item__applied_on__0_product_variant @@ -2711,9 +2719,10 @@ msgid "White" msgstr "" #. module: product -#: code:addons/product/models/decimal_precision.py:34 +#: code:addons/product/models/decimal_precision.py:0 #, python-format -msgid "You are setting a Decimal Accuracy less precise than the UOMs:\n" +msgid "" +"You are setting a Decimal Accuracy less precise than the UOMs:\n" "%s\n" "This may cause inconsistencies in computations.\n" "Please increase the rounding of those units of measure, or the digits of this Decimal Accuracy." diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index a5a93582b50..1e187d48d16 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 14:19+0000\n" -"PO-Revision-Date: 2020-11-16 14:19+0000\n" +"POT-Creation-Date: 2020-11-27 11:23+0000\n" +"PO-Revision-Date: 2020-11-27 11:23+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -2451,7 +2451,7 @@ msgstr "" #. module: project #: model_terms:ir.ui.view,arch_db:project.res_config_settings_view_form msgid "" -"Plan resource allocation accross projets and tasks, and estimate deadlines " +"Plan resource allocation across projets and tasks, and estimate deadlines " "more accurately" msgstr "" diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml index 77c897ebef6..88c742ce2e2 100644 --- a/addons/project/views/res_config_settings_views.xml +++ b/addons/project/views/res_config_settings_views.xml @@ -70,7 +70,7 @@ <div class="o_setting_right_pane"> <label for="module_project_forecast"/> <div class="text-muted" name="project_forecast_msg"> - Plan resource allocation accross projets and tasks, and estimate deadlines more accurately + Plan resource allocation across projets and tasks, and estimate deadlines more accurately </div> </div> </div> diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 54f599ee4b8..b82178f1c82 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 13:33+0000\n" -"PO-Revision-Date: 2020-11-16 13:33+0000\n" +"POT-Creation-Date: 2020-11-27 13:50+0000\n" +"PO-Revision-Date: 2020-11-27 13:50+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -384,7 +384,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order_line__qty_received_method msgid "" -"According to product configuration, the recieved quantity can be automatically computed by mechanism :\n" +"According to product configuration, the received quantity can be automatically computed by mechanism :\n" " - Manual: the quantity is set manually on the line\n" " - Stock Moves: the quantity comes from confirmed pickings\n" msgstr "" @@ -482,7 +482,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,help:purchase.field_res_config_settings__group_send_reminder -msgid "Allow automatically send email to reminde your vendor the receipt date" +msgid "Allow automatically send email to remind your vendor the receipt date" msgstr "" #. module: purchase diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index 82a73749b85..0db35d6295c 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -782,7 +782,7 @@ class PurchaseOrderLine(models.Model): qty_invoiced = fields.Float(compute='_compute_qty_invoiced', string="Billed Qty", digits='Product Unit of Measure', store=True) qty_received_method = fields.Selection([('manual', 'Manual')], string="Received Qty Method", compute='_compute_qty_received_method', store=True, - help="According to product configuration, the recieved quantity can be automatically computed by mechanism :\n" + help="According to product configuration, the received quantity can be automatically computed by mechanism :\n" " - Manual: the quantity is set manually on the line\n" " - Stock Moves: the quantity comes from confirmed pickings\n") qty_received = fields.Float("Received Qty", compute='_compute_qty_received', inverse='_inverse_qty_received', compute_sudo=True, store=True, digits='Product Unit of Measure') diff --git a/addons/purchase/models/res_config_settings.py b/addons/purchase/models/res_config_settings.py index 6457eaa2e31..f19b32cbd17 100644 --- a/addons/purchase/models/res_config_settings.py +++ b/addons/purchase/models/res_config_settings.py @@ -31,7 +31,7 @@ class ResConfigSettings(models.TransientModel): help="Margin of error for vendor lead times. When the system generates Purchase Orders for reordering products,they will be scheduled that many days earlier to cope with unexpected vendor delays.") group_send_reminder = fields.Boolean("Receipt Reminder", implied_group='purchase.group_send_reminder', default=True, - help="Allow automatically send email to reminde your vendor the receipt date") + help="Allow automatically send email to remind your vendor the receipt date") @api.onchange('use_po_lead') def _onchange_use_po_lead(self): diff --git a/addons/purchase_stock/i18n/purchase_stock.pot b/addons/purchase_stock/i18n/purchase_stock.pot index d20b73dc637..fc701838ba3 100644 --- a/addons/purchase_stock/i18n/purchase_stock.pot +++ b/addons/purchase_stock/i18n/purchase_stock.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-07 07:33+0000\n" -"PO-Revision-Date: 2020-09-07 07:33+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -41,6 +41,13 @@ msgid "<p>Those dates have been updated accordingly on the receipt %s.</p>" msgstr "" #. module: purchase_stock +#: model_terms:ir.ui.view,arch_db:purchase_stock.purchase_order_view_form_inherit +msgid "" +"<span attrs=\"{'invisible': [('on_time_rate', '>=', 0)]}\">No On-time " +"Delivery Data</span>" +msgstr "" + +#. module: purchase_stock #: model_terms:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_stock msgid "" "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-" @@ -80,7 +87,7 @@ msgstr "" #. module: purchase_stock #: model:ir.model.fields,help:purchase_stock.field_purchase_order_line__qty_received_method msgid "" -"According to product configuration, the recieved quantity can be automatically computed by mechanism :\n" +"According to product configuration, the received quantity can be automatically computed by mechanism :\n" " - Manual: the quantity is set manually on the line\n" " - Stock Moves: the quantity comes from confirmed pickings\n" msgstr "" @@ -356,6 +363,12 @@ msgid "Lot/Serial" msgstr "" #. module: purchase_stock +#: code:addons/purchase_stock/models/stock_rule.py:0 +#, python-format +msgid "Manual Replenishment" +msgstr "" + +#. module: purchase_stock #: model_terms:ir.ui.view,arch_db:purchase_stock.exception_on_po msgid "Manual actions may be needed." msgstr "" @@ -384,6 +397,11 @@ msgid "Next transfer(s) impacted:" msgstr "" #. module: purchase_stock +#: model_terms:ir.ui.view,arch_db:purchase_stock.res_partner_view_purchase_buttons_inherit +msgid "No data yet" +msgstr "" + +#. module: purchase_stock #: code:addons/purchase_stock/models/account_invoice.py:0 #, python-format msgid "" @@ -430,8 +448,8 @@ msgstr "" #: model:ir.model.fields,help:purchase_stock.field_res_partner__on_time_rate #: model:ir.model.fields,help:purchase_stock.field_res_users__on_time_rate msgid "" -"Over the past 12 months, number of products received on time / total number " -"of ordered products." +"Over the past 12 months; the number of products received on time divided by " +"the number of ordered products." msgstr "" #. module: purchase_stock @@ -541,6 +559,12 @@ msgid "Receptions" msgstr "" #. module: purchase_stock +#: code:addons/purchase_stock/models/stock_rule.py:0 +#, python-format +msgid "Replenishment Report" +msgstr "" + +#. module: purchase_stock #: model_terms:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_purchase msgid "Request your vendors to deliver to your customers" msgstr "" diff --git a/addons/purchase_stock/models/res_partner.py b/addons/purchase_stock/models/res_partner.py index 2be6a937736..0cdcf8bfd97 100644 --- a/addons/purchase_stock/models/res_partner.py +++ b/addons/purchase_stock/models/res_partner.py @@ -12,7 +12,7 @@ class ResPartner(models.Model): purchase_line_ids = fields.One2many('purchase.order.line', 'partner_id', string="Purchase Lines") on_time_rate = fields.Float( "On-Time Delivery Rate", compute='_compute_on_time_rate', - help="Over the past 12 months, number of products received on time / total number of ordered products.") + help="Over the past 12 months; the number of products received on time divided by the number of ordered products.") @api.depends('purchase_line_ids') def _compute_on_time_rate(self): diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot index c090936d3b4..bd2b0520103 100644 --- a/addons/rating/i18n/rating.pot +++ b/addons/rating/i18n/rating.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-01 07:29+0000\n" -"PO-Revision-Date: 2020-09-01 07:29+0000\n" +"POT-Creation-Date: 2020-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -295,7 +295,7 @@ msgstr "" #. module: rating #: model:ir.model.constraint,message:rating.constraint_rating_rating_rating_range -msgid "Rating should be between 0 to 5" +msgid "Rating should be between 0 and 5" msgstr "" #. module: rating diff --git a/addons/rating/models/rating.py b/addons/rating/models/rating.py index 3d3ed658c29..c28e19d5890 100644 --- a/addons/rating/models/rating.py +++ b/addons/rating/models/rating.py @@ -18,7 +18,7 @@ class Rating(models.Model): _order = 'write_date desc' _rec_name = 'res_name' _sql_constraints = [ - ('rating_range', 'check(rating >= 0 and rating <= 5)', 'Rating should be between 0 to 5'), + ('rating_range', 'check(rating >= 0 and rating <= 5)', 'Rating should be between 0 and 5'), ] @api.depends('res_model', 'res_id') diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 86db06716f5..c9a6110ea0a 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-29 15:48+0000\n" -"PO-Revision-Date: 2020-10-29 15:48+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -47,7 +47,8 @@ msgstr "" #: model:mail.template,subject:sale.email_template_edi_sale msgid "" "${object.company_id.name} ${object.state in ('draft', 'sent') and " -"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" +"(ctx.get('proforma') and 'Proforma' or 'Quotation') or 'Order'} (Ref " +"${object.name or 'n/a' })" msgstr "" #. module: sale @@ -62,11 +63,6 @@ msgid "&nbsp;<span>on</span>&nbsp;" msgstr "" #. module: sale -#: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template -msgid "&times;" -msgstr "" - -#. module: sale #: model:ir.actions.report,print_report_name:sale.action_report_pro_forma_invoice msgid "'PRO-FORMA - %s' % (object.name)" msgstr "" diff --git a/addons/sale_project/i18n/sale_project.pot b/addons/sale_project/i18n/sale_project.pot index acdcc106db1..fa622dc3710 100644 --- a/addons/sale_project/i18n/sale_project.pot +++ b/addons/sale_project/i18n/sale_project.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 13:33+0000\n" -"PO-Revision-Date: 2020-11-16 13:33+0000\n" +"POT-Creation-Date: 2020-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -273,12 +273,6 @@ msgid "Tasks associated to this sale" msgstr "" #. module: sale_project -#: model:ir.model.constraint,message:sale_project.constraint_project_project_sale_order_required_if_sale_line -msgid "" -"The Project should be linked to a Sale Order to select an Sale Order Items." -msgstr "" - -#. module: sale_project #: code:addons/sale_project/models/product.py:0 #, python-format msgid "" @@ -303,6 +297,12 @@ msgid "" msgstr "" #. module: sale_project +#: model:ir.model.constraint,message:sale_project.constraint_project_project_sale_order_required_if_sale_line +msgid "" +"The project should be linked to a sale order to select a sale order item." +msgstr "" + +#. module: sale_project #: code:addons/sale_project/models/sale_order.py:0 #, python-format msgid "" diff --git a/addons/sale_project/models/project.py b/addons/sale_project/models/project.py index 9a7c521bad5..ac9a3b1f11a 100644 --- a/addons/sale_project/models/project.py +++ b/addons/sale_project/models/project.py @@ -18,7 +18,7 @@ class Project(models.Model): sale_order_id = fields.Many2one('sale.order', 'Sales Order', domain="[('partner_id', '=', partner_id)]", readonly=True, copy=False, help="Sales order to which the project is linked.") _sql_constraints = [ - ('sale_order_required_if_sale_line', "CHECK((sale_line_id IS NOT NULL AND sale_order_id IS NOT NULL) OR (sale_line_id IS NULL))", 'The Project should be linked to a Sale Order to select an Sale Order Items.'), + ('sale_order_required_if_sale_line', "CHECK((sale_line_id IS NOT NULL AND sale_order_id IS NOT NULL) OR (sale_line_id IS NULL))", 'The project should be linked to a sale order to select a sale order item.'), ] @api.model diff --git a/addons/sms/i18n/sms.pot b/addons/sms/i18n/sms.pot index b621c43ab96..0d95b0379b9 100644 --- a/addons/sms/i18n/sms.pot +++ b/addons/sms/i18n/sms.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 14:34+0000\n" -"PO-Revision-Date: 2020-11-16 14:34+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -103,6 +103,13 @@ msgid "" msgstr "" #. module: sms +#. openerp-web +#: code:addons/sms/static/src/components/notification_group/notification_group.xml:0 +#, python-format +msgid "An error occurred when sending an SMS." +msgstr "" + +#. module: sms #: model:ir.model.fields,field_description:sms.field_sms_template__model_id #: model:ir.model.fields,field_description:sms.field_sms_template_preview__model_id msgid "Applies to" @@ -112,7 +119,7 @@ msgstr "" #: code:addons/sms/wizard/sms_cancel.py:0 #, python-format msgid "" -"Are you sure you want to discard %s SMS delivery failures. You won't be able" +"Are you sure you want to discard %s SMS delivery failures? You won't be able" " to re-send these SMS later!" msgstr "" @@ -721,7 +728,7 @@ msgstr "" #. module: sms #: model:ir.model.fields,help:sms.field_sms_composer__res_ids_count msgid "" -"Number of recipients that will recieve the SMS if sent in mass mode, without" +"Number of recipients that will receive the SMS if sent in mass mode, without" " applying the Active Domain value" msgstr "" @@ -853,12 +860,16 @@ msgid "Resend Notification" msgstr "" #. module: sms +#. openerp-web +#: code:addons/sms/static/src/components/message/message.xml:0 +#: code:addons/sms/static/src/components/message/message.xml:0 #: model:ir.actions.act_window,name:sms.sms_sms_action #: model:ir.model.fields,field_description:sms.field_mail_notification__sms_id #: model:ir.model.fields.selection,name:sms.selection__mail_message__message_type__sms #: model:ir.model.fields.selection,name:sms.selection__mail_notification__notification_type__sms #: model:ir.ui.menu,name:sms.sms_sms_menu #: model_terms:ir.ui.view,arch_db:sms.sms_tsms_view_form +#, python-format msgid "SMS" msgstr "" @@ -903,6 +914,13 @@ msgid "SMS Delivery error" msgstr "" #. module: sms +#. openerp-web +#: code:addons/sms/static/src/models/notification_group/notification_group.js:0 +#, python-format +msgid "SMS Failures" +msgstr "" + +#. module: sms #: model:ir.model.fields,field_description:sms.field_mail_notification__sms_number msgid "SMS Number" msgstr "" diff --git a/addons/sms/wizard/sms_cancel.py b/addons/sms/wizard/sms_cancel.py index 5120e94cc4f..0587a9f039c 100644 --- a/addons/sms/wizard/sms_cancel.py +++ b/addons/sms/wizard/sms_cancel.py @@ -14,7 +14,7 @@ class SMSCancel(models.TransientModel): @api.depends('model') def _compute_help_message(self): for wizard in self: - wizard.help_message = _("Are you sure you want to discard %s SMS delivery failures. You won't be able to re-send these SMS later!") % (wizard._context.get('unread_counter')) + wizard.help_message = _("Are you sure you want to discard %s SMS delivery failures? You won't be able to re-send these SMS later!") % (wizard._context.get('unread_counter')) def action_cancel(self): # TDE CHECK: delete pending SMS diff --git a/addons/sms/wizard/sms_composer.py b/addons/sms/wizard/sms_composer.py index da49d8bdbf9..57b6d27ecf4 100644 --- a/addons/sms/wizard/sms_composer.py +++ b/addons/sms/wizard/sms_composer.py @@ -41,7 +41,7 @@ class SendSMS(models.TransientModel): res_ids = fields.Char('Document IDs') res_ids_count = fields.Integer( 'Visible records count', compute='_compute_recipients_count', compute_sudo=False, - help='Number of recipients that will recieve the SMS if sent in mass mode, without applying the Active Domain value') + help='Number of recipients that will receive the SMS if sent in mass mode, without applying the Active Domain value') use_active_domain = fields.Boolean('Use active domain') active_domain = fields.Text('Active domain', readonly=True) active_domain_count = fields.Integer( diff --git a/addons/snailmail/i18n/snailmail.pot b/addons/snailmail/i18n/snailmail.pot index 3bc1841aab0..00545e932ab 100644 --- a/addons/snailmail/i18n/snailmail.pot +++ b/addons/snailmail/i18n/snailmail.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 10:35+0000\n" -"PO-Revision-Date: 2020-11-17 10:35+0000\n" +"POT-Creation-Date: 2020-11-27 11:24+0000\n" +"PO-Revision-Date: 2020-11-27 11:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "" #: code:addons/snailmail/wizard/snailmail_letter_cancel.py:0 #, python-format msgid "" -"Are you sure you want to discard %s snailmail delivery failures. You won't " +"Are you sure you want to discard %s snailmail delivery failures? You won't " "be able to re-send these letters later!" msgstr "" diff --git a/addons/snailmail/wizard/snailmail_letter_cancel.py b/addons/snailmail/wizard/snailmail_letter_cancel.py index d27eb801314..59d55325124 100644 --- a/addons/snailmail/wizard/snailmail_letter_cancel.py +++ b/addons/snailmail/wizard/snailmail_letter_cancel.py @@ -11,7 +11,7 @@ class SnailmailLetterCancel(models.TransientModel): @api.depends('model') def _compute_help_message(self): for wizard in self: - wizard.help_message = _("Are you sure you want to discard %s snailmail delivery failures. You won't be able to re-send these letters later!") % (wizard._context.get('unread_counter')) + wizard.help_message = _("Are you sure you want to discard %s snailmail delivery failures? You won't be able to re-send these letters later!") % (wizard._context.get('unread_counter')) def cancel_resend_action(self): author_id = self.env.user.id diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index 9043a4b8819..4562059d3b6 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 13:33+0000\n" -"PO-Revision-Date: 2020-11-16 13:33+0000\n" +"POT-Creation-Date: 2020-11-27 11:23+0000\n" +"PO-Revision-Date: 2020-11-27 11:23+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -677,15 +677,15 @@ msgid "Allowed Route" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_inventory__start_empty -msgid "Allows to start with an empty inventory." +#: model:ir.model.fields,help:stock.field_stock_inventory__prefill_counted_quantity +msgid "" +"Allows to start with a pre-filled counted quantity for each lines or with " +"all counted quantities set to zero." msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_inventory__prefill_counted_quantity -msgid "" -"Allows to start with prefill counted quantity for each lines or with all " -"counted quantity set to zero." +#: model:ir.model.fields,help:stock.field_stock_inventory__start_empty +msgid "Allows to start with an empty inventory." msgstr "" #. module: stock @@ -3723,7 +3723,6 @@ msgstr "" #. module: stock #: code:addons/stock/models/stock_move_line.py:0 -#: code:addons/stock/models/stock_picking.py:0 #, python-format msgid "New Move:" msgstr "" diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py index 560b43e0ae1..9bfc158e3da 100644 --- a/addons/stock/models/stock_inventory.py +++ b/addons/stock/models/stock_inventory.py @@ -56,8 +56,8 @@ class Inventory(models.Model): start_empty = fields.Boolean('Empty Inventory', help="Allows to start with an empty inventory.") prefill_counted_quantity = fields.Selection(string='Counted Quantities', - help="Allows to start with prefill counted quantity for each lines or " - "with all counted quantity set to zero.", default='counted', + help="Allows to start with a pre-filled counted quantity for each lines or " + "with all counted quantities set to zero.", default='counted', selection=[('counted', 'Default to stock on hand'), ('zero', 'Default to zero')]) exhausted = fields.Boolean( 'Include Exhausted Products', readonly=True, diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml index 76e9adf2940..dacc8ff808d 100644 --- a/addons/stock/report/report_stockpicking_operations.xml +++ b/addons/stock/report/report_stockpicking_operations.xml @@ -85,7 +85,7 @@ </thead> <tbody> <t t-foreach="o.move_ids_without_package" t-as="move"> - <!-- In case you come accross duplicated lines, ask NIM or LAP --> + <!-- In case you come across duplicated lines, ask NIM or LAP --> <t t-foreach="move.move_line_ids.sorted(key=lambda ml: ml.location_id.id)" t-as="ml"> <tr> <td> diff --git a/addons/stock_landed_costs/i18n/stock_landed_costs.pot b/addons/stock_landed_costs/i18n/stock_landed_costs.pot index 1afbb7416ef..c5e204f8f12 100644 --- a/addons/stock_landed_costs/i18n/stock_landed_costs.pot +++ b/addons/stock_landed_costs/i18n/stock_landed_costs.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-01 07:28+0000\n" -"PO-Revision-Date: 2020-09-01 07:28+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -245,6 +245,7 @@ msgstr "" #: model:ir.model.fields,field_description:stock_landed_costs.field_account_move__display_name #: model:ir.model.fields,field_description:stock_landed_costs.field_account_move_line__display_name #: model:ir.model.fields,field_description:stock_landed_costs.field_product_template__display_name +#: model:ir.model.fields,field_description:stock_landed_costs.field_purchase_order_line__display_name #: model:ir.model.fields,field_description:stock_landed_costs.field_res_company__display_name #: model:ir.model.fields,field_description:stock_landed_costs.field_res_config_settings__display_name #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__display_name @@ -316,6 +317,7 @@ msgstr "" #: model:ir.model.fields,field_description:stock_landed_costs.field_account_move__id #: model:ir.model.fields,field_description:stock_landed_costs.field_account_move_line__id #: model:ir.model.fields,field_description:stock_landed_costs.field_product_template__id +#: model:ir.model.fields,field_description:stock_landed_costs.field_purchase_order_line__id #: model:ir.model.fields,field_description:stock_landed_costs.field_res_company__id #: model:ir.model.fields,field_description:stock_landed_costs.field_res_config_settings__id #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__id @@ -434,6 +436,7 @@ msgstr "" #: model:ir.model.fields,field_description:stock_landed_costs.field_account_move____last_update #: model:ir.model.fields,field_description:stock_landed_costs.field_account_move_line____last_update #: model:ir.model.fields,field_description:stock_landed_costs.field_product_template____last_update +#: model:ir.model.fields,field_description:stock_landed_costs.field_purchase_order_line____last_update #: model:ir.model.fields,field_description:stock_landed_costs.field_res_company____last_update #: model:ir.model.fields,field_description:stock_landed_costs.field_res_config_settings____last_update #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost____last_update @@ -591,6 +594,11 @@ msgid "Product Type" msgstr "" #. module: stock_landed_costs +#: model:ir.model,name:stock_landed_costs.model_purchase_order_line +msgid "Purchase Order Line" +msgstr "" + +#. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines__quantity msgid "Quantity" msgstr "" diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot index 61e4d166636..0d3aac0db83 100644 --- a/addons/survey/i18n/survey.pot +++ b/addons/survey/i18n/survey.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-16 13:33+0000\n" -"PO-Revision-Date: 2020-11-16 13:33+0000\n" +"POT-Creation-Date: 2020-11-27 15:34+0000\n" +"PO-Revision-Date: 2020-11-27 15:34+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -69,11 +69,6 @@ msgid "%s challenge certification" msgstr "" #. module: survey -#: model_terms:ir.ui.view,arch_db:survey.survey_fill_form -msgid "&times;" -msgstr "" - -#. module: survey #: model:ir.actions.report,print_report_name:survey.certification_report msgid "'Certification - %s' % (object.survey_id.display_name)" msgstr "" @@ -644,7 +639,7 @@ msgstr "" #. module: survey #: code:addons/survey/models/survey_user.py:0 #, python-format -msgid "A question is either skipped or answered, not both." +msgid "A question can either be skipped or answered, not both." msgstr "" #. module: survey diff --git a/addons/survey/models/survey_user.py b/addons/survey/models/survey_user.py index b21539c77f9..02cce6a2770 100644 --- a/addons/survey/models/survey_user.py +++ b/addons/survey/models/survey_user.py @@ -511,7 +511,7 @@ class SurveyUserInputLine(models.Model): def _check_answer_type_skipped(self): for line in self: if (line.skipped == bool(line.answer_type)): - raise ValidationError(_('A question is either skipped or answered, not both.')) + raise ValidationError(_('A question can either be skipped or answered, not both.')) # allow 0 for numerical box if line.answer_type == 'numerical_box' and float_is_zero(line['value_numerical_box'], precision_digits=6): diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot index 423a15f2e21..0379f2578c5 100644 --- a/addons/web/i18n/web.pot +++ b/addons/web/i18n/web.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-29 15:48+0000\n" -"PO-Revision-Date: 2020-10-29 15:48+0000\n" +"POT-Creation-Date: 2020-11-27 14:13+0000\n" +"PO-Revision-Date: 2020-11-27 14:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -87,13 +87,6 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/notification.xml:0 -#, python-format -msgid "×" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/js/fields/field_utils.js:0 #, python-format msgid "'%s' is not a correct date" @@ -2376,6 +2369,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/js/services/crash_manager.js:0 +#, python-format +msgid "MailDeliveryException" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/xml/base.xml:0 #: code:addons/web/static/src/xml/base.xml:0 #: code:addons/web/static/src/xml/base.xml:0 @@ -2480,13 +2480,6 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/services/crash_manager.js:92 -#, python-format -msgid "MailDeliveryException" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/js/services/crash_manager.js:0 #, python-format msgid "Missing Record" diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot index 5326280e01b..f514629c786 100644 --- a/addons/web_editor/i18n/web_editor.pot +++ b/addons/web_editor/i18n/web_editor.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-02 14:12+0000\n" -"PO-Revision-Date: 2020-10-02 14:12+0000\n" +"POT-Creation-Date: 2020-11-27 14:13+0000\n" +"PO-Revision-Date: 2020-11-27 14:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -38,13 +38,6 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/ace.xml:0 -#, python-format -msgid "×" -msgstr "" - -#. module: web_editor -#. openerp-web #: code:addons/web_editor/static/src/xml/wysiwyg.xml:0 #, python-format msgid "" @@ -180,7 +173,7 @@ msgstr "" #. module: web_editor #: model_terms:ir.ui.view,arch_db:web_editor.snippet_options_background_options -msgid "Airy" +msgid "Airy & Zigs" msgstr "" #. module: web_editor @@ -316,7 +309,7 @@ msgstr "" #. module: web_editor #: model_terms:ir.ui.view,arch_db:web_editor.snippet_options_background_options -msgid "Blocks" +msgid "Blocks & Rainy" msgstr "" #. module: web_editor @@ -353,6 +346,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/snippets.editor.js:0 +#: code:addons/web_editor/static/src/js/editor/snippets.options.js:0 #, python-format msgid "Cancel" msgstr "" @@ -1553,11 +1547,6 @@ msgid "Qweb Field qweb" msgstr "" #. module: web_editor -#: model_terms:ir.ui.view,arch_db:web_editor.snippet_options_background_options -msgid "Rainy" -msgstr "" - -#. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.js:0 #, python-format @@ -1736,6 +1725,13 @@ msgstr "" #. module: web_editor #. openerp-web +#: code:addons/web_editor/static/src/js/editor/snippets.options.js:0 +#, python-format +msgid "Save and Reload" +msgstr "" + +#. module: web_editor +#. openerp-web #: code:addons/web_editor/static/src/xml/snippets.xml:0 #: code:addons/web_editor/static/src/xml/wysiwyg.xml:0 #: code:addons/web_editor/static/src/xml/wysiwyg.xml:0 @@ -2056,6 +2052,15 @@ msgstr "" #. module: web_editor #. openerp-web +#: code:addons/web_editor/static/src/js/editor/snippets.options.js:0 +#, python-format +msgid "" +"To save a snippet, we need to save all your previous modifications and " +"reload the page." +msgstr "" + +#. module: web_editor +#. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:0 #, python-format msgid "To what URL should this link go?" @@ -2316,11 +2321,6 @@ msgid "Youtube" msgstr "" #. module: web_editor -#: model_terms:ir.ui.view,arch_db:web_editor.snippet_options_background_options -msgid "Zigs" -msgstr "" - -#. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/wysiwyg.xml:0 #, python-format diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot index 876b1abed29..4782dafbf4c 100644 --- a/addons/website/i18n/website.pot +++ b/addons/website/i18n/website.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 06:08+0000\n" -"PO-Revision-Date: 2020-11-17 06:08+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -88,12 +88,6 @@ msgid "&lt;head&gt;" msgstr "" #. module: website -#: model_terms:ir.ui.view,arch_db:website.s_popup -#: model_terms:ir.ui.view,arch_db:website.show_website_info -msgid "&times;" -msgstr "" - -#. module: website #: model_terms:ir.ui.view,arch_db:website.sitemap_index_xml #: model_terms:ir.ui.view,arch_db:website.sitemap_xml msgid "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" @@ -112,13 +106,6 @@ msgid " " msgstr "" #. module: website -#. openerp-web -#: code:addons/website/static/src/snippets/s_image_gallery/000.xml:0 -#, python-format -msgid "×" -msgstr "" - -#. module: website #: model_terms:ir.ui.view,arch_db:website.list_website_pages msgid "' did not match any pages." msgstr "" @@ -149,10 +136,16 @@ msgid "" msgstr "" #. module: website +#: model_terms:ir.ui.view,arch_db:website.footer_custom #: model_terms:ir.ui.view,arch_db:website.template_footer_centered #: model_terms:ir.ui.view,arch_db:website.template_footer_contact #: model_terms:ir.ui.view,arch_db:website.template_footer_descriptive +#: model_terms:ir.ui.view,arch_db:website.template_footer_headline #: model_terms:ir.ui.view,arch_db:website.template_footer_links +#: model_terms:ir.ui.view,arch_db:website.template_header_contact_oe_structure_header_contact_1 +#: model_terms:ir.ui.view,arch_db:website.template_header_hamburger_oe_structure_header_hamburger_3 +#: model_terms:ir.ui.view,arch_db:website.template_header_sidebar_oe_structure_header_sidebar_1 +#: model_terms:ir.ui.view,arch_db:website.template_header_vertical_oe_structure_header_vertical_2 msgid "+1 (650) 691-3277" msgstr "" @@ -183,16 +176,6 @@ msgid "...and switch the timeline contents to fit your needs." msgstr "" #. module: website -#: model_terms:ir.ui.view,arch_db:website.footer_custom -#: model_terms:ir.ui.view,arch_db:website.template_footer_headline -#: model_terms:ir.ui.view,arch_db:website.template_header_contact_oe_structure_header_contact_1 -#: model_terms:ir.ui.view,arch_db:website.template_header_hamburger_oe_structure_header_hamburger_3 -#: model_terms:ir.ui.view,arch_db:website.template_header_sidebar_oe_structure_header_sidebar_1 -#: model_terms:ir.ui.view,arch_db:website.template_header_vertical_oe_structure_header_vertical_2 -msgid "1 (650) 691-3277" -msgstr "" - -#. module: website #: model_terms:ir.ui.view,arch_db:website.default_csv msgid "1,2,3" msgstr "" @@ -1965,6 +1948,7 @@ msgstr "" #: code:addons/website/static/src/snippets/s_image_gallery/000.xml:0 #: code:addons/website/static/src/xml/website.xml:0 #: model_terms:ir.ui.view,arch_db:website.qweb_500 +#: model_terms:ir.ui.view,arch_db:website.s_popup #: model_terms:ir.ui.view,arch_db:website.show_website_info #, python-format msgid "Close" @@ -8409,6 +8393,12 @@ msgid "You may opt-out of a third-party's use of cookies by visiting the" msgstr "" #. module: website +#: code:addons/website/models/website.py:0 +#, python-format +msgid "You must keep at least one website." +msgstr "" + +#. module: website #. openerp-web #: code:addons/website/static/src/xml/website.backend.xml:0 #, python-format @@ -8870,12 +8860,6 @@ msgid "valuation, rank" msgstr "" #. module: website -#: code:addons/website/models/website.py:162 -#, python-format -msgid "You must keep at least one website." -msgstr "" - -#. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__website_id msgid "website" msgstr "" diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 3d7cfa97afb..2b54eeead21 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -405,7 +405,7 @@ <i class="fa fa-1x fa-fw fa-envelope mr-2"/><span><a href="mailto:info@yourcompany.example.com">info@yourcompany.example.com</a></span> </div> <div class="col-lg-2 text-lg-right pb16"> - <i class="fa fa-1x fa-fw fa-phone mr-2"/><span class="o_force_ltr"><a href="tel:1 (650) 691-3277">1 (650) 691-3277</a></span> + <i class="fa fa-1x fa-fw fa-phone mr-2"/><span class="o_force_ltr"><a href="tel:+1 (650) 691-3277">+1 (650) 691-3277</a></span> </div> </div> </div> @@ -513,7 +513,7 @@ <div class="oe_structure oe_structure_solo" id="oe_structure_header_vertical_2"> <section class="s_text_block" data-snippet="s_text_block" data-name="Text"> <div class="container"> - <small><i class="fa fa-1x fa-fw fa-phone mr-2"/><a href="tel:1 (650) 691-3277">1 (650) 691-3277</a></small> + <small><i class="fa fa-1x fa-fw fa-phone mr-2"/><a href="tel:+1 (650) 691-3277">+1 (650) 691-3277</a></small> </div> </section> </div> @@ -610,7 +610,7 @@ </div> <!-- Contact --> <small><i class="fa fa-envelope fa-fw mr-2"/><span><a href="mailto:info@yourcompany.example.com">info@yourcompany.example.com</a></span></small><br/> - <small><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:1 (650) 691-3277">1 (650) 691-3277</a></span></small> + <small><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:+1 (650) 691-3277">+1 (650) 691-3277</a></span></small> <!-- Separator --> <div class="s_hr text-left pt16 pb16" data-name="Separator"> <hr class="w-100 mx-auto" style="border-top-width: 1px; border-top-style: solid; border-top-color: var(--400);"/> @@ -770,7 +770,7 @@ <div class="col-lg-8"> <small> <span class="text-muted"><b>Contact us</b></span> - <i class="fa fa-1x fa-fw fa-phone ml-3 mr-2"/><a href="tel:1 (650) 691-3277">1 (650) 691-3277</a> + <i class="fa fa-1x fa-fw fa-phone ml-3 mr-2"/><a href="tel:+1 (650) 691-3277">+1 (650) 691-3277</a> <i class="fa fa-1x fa-fw fa-envelope ml-3 mr-2"/><span><a href="mailto:info@yourcompany.example.com">info@yourcompany.example.com</a></span> </small> </div> @@ -1369,7 +1369,7 @@ <ul class="list-unstyled"> <li><i class="fa fa-comment fa-fw mr-2"/><span><a href="/contactus">Contact us</a></span></li> <li><i class="fa fa-envelope fa-fw mr-2"/><span><a href="mailto:info@yourcompany.example.com">info@yourcompany.example.com</a></span></li> - <li><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:1 (650) 691-3277">1 (650) 691-3277</a></span></li> + <li><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:+1 (650) 691-3277">+1 (650) 691-3277</a></span></li> </ul> <div class="s_share text-left" data-name="Social Media"> <h5 class="s_share_title d-none">Follow us</h5> @@ -1413,7 +1413,7 @@ </div> <div class="col-lg-3"> <ul class="list-unstyled mb-2"> - <li><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:1 (650) 691-3277">+1 (650) 691-3277</a></span></li> + <li><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:+1 (650) 691-3277">+1 (650) 691-3277</a></span></li> <li><i class="fa fa-envelope fa-fw mr-2"/><span><a href="mailto:hello@mycompany.com">hello@mycompany.com</a></span></li> </ul> <div class="s_share text-left no_icon_color" data-name="Social Media"> @@ -1707,7 +1707,7 @@ </div> <div class="col-lg-6 pb24"> <ul class="list-unstyled mb-0"> - <li><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:1 (650) 691-3277">1 (650) 691-3277</a></span></li> + <li><i class="fa fa-phone fa-fw mr-2"/><span class="o_force_ltr"><a href="tel:+1 (650) 691-3277">+1 (650) 691-3277</a></span></li> <li><i class="fa fa-envelope fa-fw mr-2"/><span><a href="mailto:info@yourcompany.example.com">info@yourcompany.example.com</a></span></li> </ul> </div> diff --git a/addons/website_blog/i18n/website_blog.pot b/addons/website_blog/i18n/website_blog.pot index 5c5ade58c27..79cd7dd48a1 100644 --- a/addons/website_blog/i18n/website_blog.pot +++ b/addons/website_blog/i18n/website_blog.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 06:09+0000\n" -"PO-Revision-Date: 2020-11-17 06:09+0000\n" +"POT-Creation-Date: 2020-11-27 15:41+0000\n" +"PO-Revision-Date: 2020-11-27 15:41+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -316,7 +316,7 @@ msgstr "" #. module: website_blog #. openerp-web -#: code:addons/website_blog/static/src/js/website_blog.js:77 +#: code:addons/website_blog/static/src/js/website_blog.js:0 #, python-format msgid "Amazing blog article: %s! Check it live: %s" msgstr "" @@ -644,7 +644,7 @@ msgstr "" #. openerp-web #: code:addons/website_blog/static/src/js/tours/website_blog.js:0 #, python-format -msgid "Click here to add new content on your website." +msgid "Click here to add new content to your website." msgstr "" #. module: website_blog diff --git a/addons/website_blog/static/src/js/tours/website_blog.js b/addons/website_blog/static/src/js/tours/website_blog.js index 4a443036279..23b591490fb 100644 --- a/addons/website_blog/static/src/js/tours/website_blog.js +++ b/addons/website_blog/static/src/js/tours/website_blog.js @@ -10,7 +10,7 @@ odoo.define("website_blog.tour", function (require) { url: "/", }, [{ trigger: '#new-content-menu > a', - content: _t("Click here to add new content on your website."), + content: _t("Click here to add new content to your website."), position: 'bottom', }, { diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot index 8df0af72937..a0bff9b230e 100644 --- a/addons/website_event/i18n/website_event.pot +++ b/addons/website_event/i18n/website_event.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 06:16+0000\n" -"PO-Revision-Date: 2020-11-17 06:16+0000\n" +"POT-Creation-Date: 2020-11-27 15:41+0000\n" +"PO-Revision-Date: 2020-11-27 15:41+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -229,11 +229,6 @@ msgid "" msgstr "" #. module: website_event -#: model_terms:ir.ui.view,arch_db:website_event.registration_attendee_details -msgid "<span>&times;</span>" -msgstr "" - -#. module: website_event #: model_terms:ir.ui.view,arch_db:website_event.event_location msgid "<span>Online Events</span>" msgstr "" @@ -327,7 +322,7 @@ msgstr "" #. openerp-web #: code:addons/website_event/static/src/js/tours/website_event.js:0 #, python-format -msgid "Click here to add new content on your website." +msgid "Click here to add new content to your website." msgstr "" #. module: website_event diff --git a/addons/website_event/static/src/js/tours/website_event.js b/addons/website_event/static/src/js/tours/website_event.js index 0fc530bef46..b07c83a3a00 100644 --- a/addons/website_event/static/src/js/tours/website_event.js +++ b/addons/website_event/static/src/js/tours/website_event.js @@ -9,7 +9,7 @@ odoo.define("website_event.tour", function (require) { tour.register("event", { url: "/", }, [{ - content: _t("Click here to add new content on your website."), + content: _t("Click here to add new content to your website."), trigger: '#new-content-menu > a', position: 'bottom', }, { diff --git a/addons/website_event_questions/data/event_question_demo.xml b/addons/website_event_questions/data/event_question_demo.xml index 16772d46bb3..721bbf40101 100644 --- a/addons/website_event_questions/data/event_question_demo.xml +++ b/addons/website_event_questions/data/event_question_demo.xml @@ -2,7 +2,7 @@ <odoo><data> <!-- EVENT TYPE SPECIFIC --> <record id="event_type_data_conference_question_0" model="event.question"> - <field name="title">Participate to Social Event</field> + <field name="title">Participate in Social Event</field> <field name="once_per_order" eval="False"/> <field name="event_type_id" ref="event.event_type_data_conference"/> </record> diff --git a/addons/website_event_questions/i18n/website_event_questions.pot b/addons/website_event_questions/i18n/website_event_questions.pot index 5ba50c7ccdc..f70f50016ce 100644 --- a/addons/website_event_questions/i18n/website_event_questions.pot +++ b/addons/website_event_questions/i18n/website_event_questions.pot @@ -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:46+0000\n" -"PO-Revision-Date: 2020-09-29 13:46+0000\n" +"POT-Creation-Date: 2020-11-27 15:27+0000\n" +"PO-Revision-Date: 2020-11-27 15:27+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgstr "" #. module: website_event_questions #: model:event.question,title:website_event_questions.event_type_data_conference_question_0 -msgid "Participate to Social Event" +msgid "Participate in Social Event" msgstr "" #. module: website_event_questions diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot index a39fc1e85fb..4d58dc83990 100644 --- a/addons/website_event_track/i18n/website_event_track.pot +++ b/addons/website_event_track/i18n/website_event_track.pot @@ -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:46+0000\n" -"PO-Revision-Date: 2020-09-29 13:46+0000\n" +"POT-Creation-Date: 2020-11-27 14:13+0000\n" +"PO-Revision-Date: 2020-11-27 14:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1937,7 +1937,7 @@ msgstr "" #. module: website_event_track #: model_terms:ir.actions.act_window,help:website_event_track.event_sponsor_action_from_event msgid "" -"Sponsors might be advertised on you event pages footer.<br>\n" +"Sponsors might be advertised on your event pages footer.<br>\n" " Exhibitors might have a dedicated page with chat room for people to connect with them." msgstr "" diff --git a/addons/website_event_track_quiz/i18n/website_event_track_quiz.pot b/addons/website_event_track_quiz/i18n/website_event_track_quiz.pot index de3388e0319..f467f68afc0 100644 --- a/addons/website_event_track_quiz/i18n/website_event_track_quiz.pot +++ b/addons/website_event_track_quiz/i18n/website_event_track_quiz.pot @@ -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:46+0000\n" -"PO-Revision-Date: 2020-09-29 13:46+0000\n" +"POT-Creation-Date: 2020-11-27 14:13+0000\n" +"PO-Revision-Date: 2020-11-27 14:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -331,7 +331,7 @@ msgstr "" #. module: website_event_track_quiz #: code:addons/website_event_track_quiz/models/event_quiz.py:0 #, python-format -msgid "Question \"%s\" must have 1 correct answer and at least 1 invalid answer" +msgid "Question \"%s\" must have 1 correct answer and at least 1 incorrect answer" msgstr "" #. module: website_event_track_quiz diff --git a/addons/website_form/i18n/website_form.pot b/addons/website_form/i18n/website_form.pot index 61d31c465bd..3ca3fabf79f 100644 --- a/addons/website_form/i18n/website_form.pot +++ b/addons/website_form/i18n/website_form.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-17 06:08+0000\n" -"PO-Revision-Date: 2020-11-17 06:08+0000\n" +"POT-Creation-Date: 2020-11-27 14:13+0000\n" +"PO-Revision-Date: 2020-11-27 14:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -30,6 +30,11 @@ msgid "'%s' is not a correct datetime" msgstr "" #. module: website_form +#: model_terms:ir.ui.view,arch_db:website_form.s_website_form_options +msgid ", .s_website_form" +msgstr "" + +#. module: website_form #: code:addons/website_form/controllers/main.py:0 #, python-format msgid "<p>Attached files : </p>" diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot index 5382a99f662..2865943ffa6 100644 --- a/addons/website_forum/i18n/website_forum.pot +++ b/addons/website_forum/i18n/website_forum.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-29 15:48+0000\n" -"PO-Revision-Date: 2020-10-29 15:48+0000\n" +"POT-Creation-Date: 2020-11-27 14:12+0000\n" +"PO-Revision-Date: 2020-11-27 14:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -532,6 +532,11 @@ msgid "" msgstr "" #. module: website_forum +#: model_terms:ir.ui.view,arch_db:website_forum.moderation_queue +msgid "<span aria-label=\"Close\">×</span>" +msgstr "" + +#. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.post_description_full msgid "<span class=\"badge badge-info\">Closed</span>" msgstr "" @@ -606,11 +611,6 @@ msgstr "" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.moderation_queue -msgid "<span>&times;</span>" -msgstr "" - -#. module: website_forum -#: model_terms:ir.ui.view,arch_db:website_forum.moderation_queue msgid "<span>By </span>" msgstr "" diff --git a/addons/website_livechat/i18n/website_livechat.pot b/addons/website_livechat/i18n/website_livechat.pot index 6f418279258..c92ace0fbcc 100644 --- a/addons/website_livechat/i18n/website_livechat.pot +++ b/addons/website_livechat/i18n/website_livechat.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-01 07:29+0000\n" -"PO-Revision-Date: 2020-09-01 07:29+0000\n" +"POT-Creation-Date: 2020-11-27 14:13+0000\n" +"PO-Revision-Date: 2020-11-27 14:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -57,6 +57,13 @@ msgid "Available" msgstr "" #. module: website_livechat +#. openerp-web +#: code:addons/website_livechat/static/src/components/visitor_banner/visitor_banner.xml:0 +#, python-format +msgid "Avatar" +msgstr "" + +#. module: website_livechat #: model_terms:ir.ui.view,arch_db:website_livechat.channel_page msgid "Bad" msgstr "" @@ -122,6 +129,13 @@ msgid "Happy face" msgstr "" #. module: website_livechat +#. openerp-web +#: code:addons/website_livechat/static/src/components/visitor_banner/visitor_banner.xml:0 +#, python-format +msgid "History" +msgstr "" + +#. module: website_livechat #: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel__id #: model:ir.model.fields,field_description:website_livechat.field_ir_http__id #: model:ir.model.fields,field_description:website_livechat.field_mail_channel__id @@ -137,6 +151,13 @@ msgid "Is Published" msgstr "" #. module: website_livechat +#. openerp-web +#: code:addons/website_livechat/static/src/components/visitor_banner/visitor_banner.xml:0 +#, python-format +msgid "Lang" +msgstr "" + +#. module: website_livechat #: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel____last_update #: model:ir.model.fields,field_description:website_livechat.field_ir_http____last_update #: model:ir.model.fields,field_description:website_livechat.field_mail_channel____last_update @@ -203,6 +224,13 @@ msgid "Okay" msgstr "" #. module: website_livechat +#. openerp-web +#: code:addons/website_livechat/static/src/components/visitor_banner/visitor_banner.xml:0 +#, python-format +msgid "Online" +msgstr "" + +#. module: website_livechat #: model:ir.model.fields,field_description:website_livechat.field_website_visitor__livechat_operator_name msgid "Operator Name" msgstr "" @@ -293,6 +321,13 @@ msgid "Visitor" msgstr "" #. module: website_livechat +#. openerp-web +#: code:addons/website_livechat/static/src/components/visitor_banner/visitor_banner.xml:0 +#, python-format +msgid "Visitor is online" +msgstr "" + +#. module: website_livechat #: model:ir.actions.act_window,name:website_livechat.website_visitor_livechat_session_action msgid "Visitor's Sessions" msgstr "" @@ -308,7 +343,10 @@ msgid "Visitors" msgstr "" #. module: website_livechat +#. openerp-web +#: code:addons/website_livechat/static/src/components/visitor_banner/visitor_banner.xml:0 #: model:ir.model,name:website_livechat.model_website +#, python-format msgid "Website" msgstr "" diff --git a/addons/website_sale_coupon/i18n/website_sale_coupon.pot b/addons/website_sale_coupon/i18n/website_sale_coupon.pot index bb09792e80e..41ad169cef8 100644 --- a/addons/website_sale_coupon/i18n/website_sale_coupon.pot +++ b/addons/website_sale_coupon/i18n/website_sale_coupon.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~13.5\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-01 07:29+0000\n" -"PO-Revision-Date: 2020-09-01 07:29+0000\n" +"POT-Creation-Date: 2020-11-27 14:13+0000\n" +"PO-Revision-Date: 2020-11-27 14:13+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,6 +16,11 @@ msgstr "" "Plural-Forms: \n" #. module: website_sale_coupon +#: model:ir.model,name:website_sale_coupon.model_coupon_coupon +msgid "Coupon" +msgstr "" + +#. module: website_sale_coupon #: model:ir.model,name:website_sale_coupon.model_coupon_program msgid "Coupon Program" msgstr "" @@ -37,12 +42,14 @@ msgid "Discounted amount" msgstr "" #. module: website_sale_coupon +#: model:ir.model.fields,field_description:website_sale_coupon.field_coupon_coupon__display_name #: model:ir.model.fields,field_description:website_sale_coupon.field_coupon_program__display_name #: model:ir.model.fields,field_description:website_sale_coupon.field_sale_order__display_name msgid "Display Name" msgstr "" #. module: website_sale_coupon +#: model:ir.model.fields,field_description:website_sale_coupon.field_coupon_coupon__id #: model:ir.model.fields,field_description:website_sale_coupon.field_coupon_program__id #: model:ir.model.fields,field_description:website_sale_coupon.field_sale_order__id msgid "ID" @@ -54,6 +61,7 @@ msgid "Invalid or expired promo code." msgstr "" #. module: website_sale_coupon +#: model:ir.model.fields,field_description:website_sale_coupon.field_coupon_coupon____last_update #: model:ir.model.fields,field_description:website_sale_coupon.field_coupon_program____last_update #: model:ir.model.fields,field_description:website_sale_coupon.field_sale_order____last_update msgid "Last Modified on" diff --git a/addons/website_sale_slides/i18n/website_sale_slides.pot b/addons/website_sale_slides/i18n/website_sale_slides.pot index e7f53e241b4..8f3075b1d63 100644 --- a/addons/website_sale_slides/i18n/website_sale_slides.pot +++ b/addons/website_sale_slides/i18n/website_sale_slides.pot @@ -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:46+0000\n" -"PO-Revision-Date: 2020-09-29 13:46+0000\n" +"POT-Creation-Date: 2020-11-27 13:37+0000\n" +"PO-Revision-Date: 2020-11-27 13:37+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -38,6 +38,13 @@ msgid "Buy course" msgstr "" #. module: website_sale_slides +#. openerp-web +#: code:addons/website_sale_slides/static/src/xml/website_sale_slides_quiz.xml:0 +#, python-format +msgid "Buy the course to validate your answers!" +msgstr "" + +#. module: website_sale_slides #: model:ir.model.fields,help:website_sale_slides.field_slide_channel__enroll msgid "Condition to enroll: everyone, on invite, on payment (sale bridge)." msgstr "" @@ -188,13 +195,6 @@ msgid "This course is paid." msgstr "" #. module: website_sale_slides -#. openerp-web -#: code:addons/website_sale_slides/static/src/xml/website_sale_slides_quiz.xml:0 -#, python-format -msgid "To validate your answers, buy the course!" -msgstr "" - -#. module: website_sale_slides #: model:ir.model.fields,field_description:website_sale_slides.field_slide_channel__product_sale_revenues msgid "Total revenues" msgstr "" diff --git a/addons/website_sale_slides/static/src/xml/website_sale_slides_quiz.xml b/addons/website_sale_slides/static/src/xml/website_sale_slides_quiz.xml index 5a371469a49..a03182dd67e 100644 --- a/addons/website_sale_slides/static/src/xml/website_sale_slides_quiz.xml +++ b/addons/website_sale_slides/static/src/xml/website_sale_slides_quiz.xml @@ -7,7 +7,7 @@ Sign in and buy the course to take the quiz </t> <t t-else=""> - To validate your answers, buy the course! + Buy the course to validate your answers! </t> </span> </t> diff --git a/addons/website_slides_survey/data/survey_demo.xml b/addons/website_slides_survey/data/survey_demo.xml index 99e9c30929d..114a3f3dab7 100644 --- a/addons/website_slides_survey/data/survey_demo.xml +++ b/addons/website_slides_survey/data/survey_demo.xml @@ -14,7 +14,7 @@ <field name="certification_mail_template_id" ref="survey.mail_template_certification"></field> <field name="is_attempts_limited" eval="True" /> <field name="attempts_limit">3</field> - <field name="description"><p>Test your furniture knowledge!.</p></field> + <field name="description"><p>Test your furniture knowledge!</p></field> </record> <!-- Page 1 --> <record model="survey.question" id="furniture_certification_page_1"> diff --git a/addons/website_slides_survey/i18n/website_slides_survey.pot b/addons/website_slides_survey/i18n/website_slides_survey.pot index 2b46d7e97e0..da11c69dc31 100644 --- a/addons/website_slides_survey/i18n/website_slides_survey.pot +++ b/addons/website_slides_survey/i18n/website_slides_survey.pot @@ -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:46+0000\n" -"PO-Revision-Date: 2020-09-29 13:46+0000\n" +"POT-Creation-Date: 2020-11-27 15:29+0000\n" +"PO-Revision-Date: 2020-11-27 15:29+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,12 +64,8 @@ msgid "<i class=\"text-muted\"> awarded users</i>" msgstr "" #. module: website_slides_survey -#: model:survey.survey,description:website_slides_survey.furniture_certification -msgid "<p>Test your furniture knowledge!.</p>" -msgstr "" - -#. module: website_slides_survey #: model:survey.question,description:website_slides_survey.furniture_certification_page_1 +#: model:survey.survey,description:website_slides_survey.furniture_certification msgid "<p>Test your furniture knowledge!</p>" msgstr "" |