diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index f147d8361b0..96f1d9dc282 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-16 08:08+0000\n" -"PO-Revision-Date: 2017-11-16 08:08+0000\n" +"POT-Creation-Date: 2018-01-10 07:40+0000\n" +"PO-Revision-Date: 2018-01-10 07:40+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1009,11 +1009,6 @@ msgstr "" msgid "Account" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant -msgid "Account Accountant" -msgstr "" - #. module: account #: model:ir.model,name:account.model_account_aged_trial_balance msgid "Account Aged Trial balance Report" @@ -1328,6 +1323,7 @@ msgid "Account used as counterpart for the journal entry, for taxes eligible bas msgstr "" #. module: account +#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant #: model:ir.ui.menu,name:account.account_account_menu msgid "Accounting" msgstr "" @@ -1669,7 +1665,6 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:252 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal -#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total #: model:ir.model.fields,field_description:account.field_account_move_amount @@ -3648,6 +3643,19 @@ msgstr "" msgid "Deactivate setup bar on the dashboard" msgstr "" +#. module: account +#: code:addons/account/models/company.py:43 +#, python-format +msgid "Dear Sir/Madam,\n" +"\n" +"Our records indicate that some payments on your account are still due. Please find details below.\n" +"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n" +"If you have any queries regarding your account, Please contact us.\n" +"\n" +"Thank you in advance for your cooperation.\n" +"Best Regards," +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line_debit #: model:ir.ui.view,arch_db:account.report_financial @@ -9656,6 +9664,7 @@ msgid "Total" msgstr "" #. module: account +#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total #: model:ir.ui.view,arch_db:account.view_move_tree msgid "Total Amount" msgstr "" @@ -9843,19 +9852,13 @@ msgstr "" msgid "UP" msgstr "" -#. module: account -#: code:addons/account/models/account.py:944 -#, python-format -msgid "Unable to mix any taxes being price included with taxes affecting the base amount but not included in price." -msgstr "" - #. module: account #: selection:account.journal,bank_statements_source:0 msgid "Undefined Yet" msgstr "" #. module: account -#: code:addons/account/models/company.py:304 +#: code:addons/account/models/company.py:305 #, python-format msgid "Undistributed Profits/Losses" msgstr "" diff --git a/addons/account/models/company.py b/addons/account/models/company.py index c226e2eb8be..1465c69082b 100644 --- a/addons/account/models/company.py +++ b/addons/account/models/company.py @@ -40,14 +40,14 @@ class ResCompany(models.Model): property_stock_valuation_account_id = fields.Many2one('account.account', string="Account Template for Stock Valuation") bank_journal_ids = fields.One2many('account.journal', 'company_id', domain=[('type', '=', 'bank')], string='Bank Journals') overdue_msg = fields.Text(string='Overdue Payments Message', translate=True, - default='''Dear Sir/Madam, + default=lambda s: _('''Dear Sir/Madam, Our records indicate that some payments on your account are still due. Please find details below. If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below. If you have any queries regarding your account, Please contact us. Thank you in advance for your cooperation. -Best Regards,''') +Best Regards,''')) tax_exigibility = fields.Boolean(string='Use Cash Basis') #Fields of the setup step for opening move diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot index ecf6ef9ed88..ed2d1b0dde0 100644 --- a/addons/payment/i18n/payment.pot +++ b/addons/payment/i18n/payment.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~18\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 09:53+0000\n" -"PO-Revision-Date: 2017-09-20 09:53+0000\n" +"POT-Creation-Date: 2018-01-10 07:40+0000\n" +"PO-Revision-Date: 2018-01-10 07:40+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -40,64 +40,88 @@ msgstr "" msgid " Delete" msgstr "" +#. module: payment +#: code:addons/payment/models/payment_acquirer.py:112 +#, python-format +msgid "Cancel, Your payment has been cancelled." +msgstr "" + +#. module: payment +#: code:addons/payment/models/payment_acquirer.py:108 +#, python-format +msgid "Done, Your online payment has been successfully processed. Thank you for your order." +msgstr "" + +#. module: payment +#: code:addons/payment/models/payment_acquirer.py:116 +#, python-format +msgid "Error, Please be aware that an error occurred during the transaction. The order has been confirmed but will not be paid. Do not hesitate to contact us if you have any questions on the status of your order." +msgstr "" + +#. module: payment +#: code:addons/payment/models/payment_acquirer.py:104 +#, python-format +msgid "Pending, Your online payment has been successfully processed. But your order is not validated yet." +msgstr "" + #. module: payment #. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:76 -#: code:addons/payment/static/src/js/payment_form.js:219 +#: code:addons/payment/static/src/js/payment_form.js:77 +#: code:addons/payment/static/src/js/payment_form.js:229 #, python-format msgid "

Please fill all the inputs required.

" msgstr "" #. module: payment #. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:180 +#: code:addons/payment/static/src/js/payment_form.js:190 #, python-format msgid "

Please select a payment method.

" msgstr "" #. module: payment #. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:274 +#: code:addons/payment/static/src/js/payment_form.js:287 #, python-format msgid "

Please select the option to add a new payment method.

" msgstr "" #. module: payment #. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:315 +#: code:addons/payment/static/src/js/payment_form.js:328 #, python-format msgid "

This card is currently linked to the following records:

" msgstr "" #. module: payment #. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:108 -#: code:addons/payment/static/src/js/payment_form.js:120 -#: code:addons/payment/static/src/js/payment_form.js:254 -#: code:addons/payment/static/src/js/payment_form.js:267 +#: code:addons/payment/static/src/js/payment_form.js:109 +#: code:addons/payment/static/src/js/payment_form.js:121 +#: code:addons/payment/static/src/js/payment_form.js:264 +#: code:addons/payment/static/src/js/payment_form.js:277 #, 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:298 -#: code:addons/payment/static/src/js/payment_form.js:333 +#: code:addons/payment/static/src/js/payment_form.js:311 +#: code:addons/payment/static/src/js/payment_form.js:346 #, python-format msgid "

We are not able to delete your payment method at the moment.

" msgstr "" #. module: payment #. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:155 -#: code:addons/payment/static/src/js/payment_form.js:161 +#: code:addons/payment/static/src/js/payment_form.js:162 +#: code:addons/payment/static/src/js/payment_form.js:168 #, python-format msgid "

We are not able to redirect you to the payment form.

" msgstr "" #. module: payment #. openerp-web -#: code:addons/payment/static/src/js/payment_form.js:169 +#: code:addons/payment/static/src/js/payment_form.js:179 #, python-format msgid "

We're unable to process your payment.

" msgstr "" @@ -251,8 +275,7 @@ msgstr "" #. module: payment #: model:payment.acquirer,name:payment.payment_acquirer_authorize -#: selection:payment.acquirer,provider:0 -msgid "Authorize.Net" +msgid "Authorize.net" msgstr "" #. module: payment diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py index 198f8c5d336..319807780c1 100644 --- a/addons/payment/models/payment_acquirer.py +++ b/addons/payment/models/payment_acquirer.py @@ -101,19 +101,19 @@ class PaymentAcquirer(models.Model): help='Message displayed after having done the payment process.') pending_msg = fields.Html( 'Pending Message', translate=True, - default='Pending, Your online payment has been successfully processed. But your order is not validated yet.', + default=lambda s: _('Pending, Your online payment has been successfully processed. But your order is not validated yet.'), help='Message displayed, if order is in pending state after having done the payment process.') done_msg = fields.Html( 'Done Message', translate=True, - default='Done, Your online payment has been successfully processed. Thank you for your order.', + default=lambda s: _('Done, Your online payment has been successfully processed. Thank you for your order.'), help='Message displayed, if order is done successfully after having done the payment process.') cancel_msg = fields.Html( 'Cancel Message', translate=True, - default='Cancel, Your payment has been cancelled.', + default=lambda s: _('Cancel, Your payment has been cancelled.'), help='Message displayed, if order is cancel during the payment process.') error_msg = fields.Html( 'Error Message', translate=True, - default='Error, Please be aware that an error occurred during the transaction. The order has been confirmed but will not be paid. Do not hesitate to contact us if you have any questions on the status of your order.', + default=lambda s: _('Error, Please be aware that an error occurred during the transaction. The order has been confirmed but will not be paid. Do not hesitate to contact us if you have any questions on the status of your order.'), help='Message displayed, if error is occur during the payment process.') save_token = fields.Selection([ ('none', 'Never'), diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index 1e46012c59e..101c95cdd82 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-30 13:11+0000\n" -"PO-Revision-Date: 2017-11-30 13:11+0000\n" +"POT-Creation-Date: 2018-01-10 07:39+0000\n" +"PO-Revision-Date: 2018-01-10 07:39+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -967,6 +967,7 @@ msgid "Be aware of the team’s productivity and time: try to keep meetings to o msgstr "" #. module: project +#: code:addons/project/models/project.py:29 #: model:project.task,legend_blocked:project.project_task_15 #: model:project.task,legend_blocked:project.project_task_16 #: model:project.task,legend_blocked:project.project_task_18 @@ -993,6 +994,7 @@ msgstr "" #: model:project.task.type,legend_blocked:project.project_stage_data_1 #: model:project.task.type,legend_blocked:project.project_stage_data_2 #: selection:report.project.task.user,state:0 +#, python-format msgid "Blocked" msgstr "" @@ -1903,6 +1905,7 @@ msgid "Improve collaboration with customers" msgstr "" #. module: project +#: code:addons/project/models/project.py:35 #: model:project.task,legend_normal:project.project_task_1 #: model:project.task,legend_normal:project.project_task_10 #: model:project.task,legend_normal:project.project_task_11 @@ -1951,6 +1954,7 @@ msgstr "" #: model:project.task.type,legend_normal:project.project_stage_data_2 #: model:project.task.type,name:project.project_stage_1 #: selection:report.project.task.user,state:0 +#, python-format msgid "In Progress" msgstr "" @@ -2613,6 +2617,7 @@ msgid "Rating on Tasks" msgstr "" #. module: project +#: code:addons/project/models/project.py:32 #: model:project.task,legend_done:project.project_task_1 #: model:project.task,legend_done:project.project_task_12 #: model:project.task,legend_done:project.project_task_15 @@ -2642,6 +2647,7 @@ msgstr "" #: model:project.task.type,legend_done:project.project_stage_data_0 #: model:project.task.type,legend_done:project.project_stage_data_1 #: model:project.task.type,legend_done:project.project_stage_data_2 +#, python-format msgid "Ready for Next Stage" msgstr "" diff --git a/addons/project/models/project.py b/addons/project/models/project.py index d1e27f38cbd..9e5ffa0b1aa 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -26,13 +26,13 @@ class ProjectTaskType(models.Model): string='Starred Explanation', translate=True, help='Explanation text to help users using the star on tasks or issues in this stage.') legend_blocked = fields.Char( - 'Red Kanban Label', default='Blocked', translate=True, required=True, + 'Red Kanban Label', default=lambda s: _('Blocked'), translate=True, required=True, help='Override the default value displayed for the blocked state for kanban selection, when the task or issue is in that stage.') legend_done = fields.Char( - 'Green Kanban Label', default='Ready for Next Stage', translate=True, required=True, + 'Green Kanban Label', default=lambda s: _('Ready for Next Stage'), translate=True, required=True, help='Override the default value displayed for the done state for kanban selection, when the task or issue is in that stage.') legend_normal = fields.Char( - 'Grey Kanban Label', default='In Progress', translate=True, required=True, + 'Grey Kanban Label', default=lambda s: _('In Progress'), translate=True, required=True, help='Override the default value displayed for the normal state for kanban selection, when the task or issue is in that stage.') mail_template_id = fields.Many2one( 'mail.template', diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot index f0c82a25110..3f9c7e1c750 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 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-24 09:00+0000\n" -"PO-Revision-Date: 2017-10-24 09:00+0000\n" +"POT-Creation-Date: 2018-01-10 07:40+0000\n" +"PO-Revision-Date: 2018-01-10 07:40+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -2401,7 +2401,9 @@ msgid "This community is for professional and enthusiast users,\n" msgstr "" #. module: website_forum +#: code:addons/website_forum/models/forum.py:51 #: model:forum.forum,description:website_forum.forum_help +#, python-format msgid "This community is for professionals and enthusiasts of our products and services. Share and discuss the best content and new marketing ideas, build your professional profile and become a better marketer together." msgstr "" diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 0771cacc6c4..1b9b7a8ce6d 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -48,9 +48,9 @@ class Forum(models.Model): description = fields.Text( 'Description', translate=True, - default='This community is for professionals and enthusiasts of our products and services. ' - 'Share and discuss the best content and new marketing ideas, ' - 'build your professional profile and become a better marketer together.') + default=lambda s: _('This community is for professionals and enthusiasts of our products and services. ' + 'Share and discuss the best content and new marketing ideas, ' + 'build your professional profile and become a better marketer together.')) welcome_message = fields.Html( 'Welcome Message', default = """
diff --git a/addons/website_slides/i18n/website_slides.pot b/addons/website_slides/i18n/website_slides.pot index 92adce994c9..f4658e23adf 100644 --- a/addons/website_slides/i18n/website_slides.pot +++ b/addons/website_slides/i18n/website_slides.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~18\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-02 11:27+0000\n" -"PO-Revision-Date: 2017-10-02 11:27+0000\n" +"POT-Creation-Date: 2018-01-10 07:40+0000\n" +"PO-Revision-Date: 2018-01-10 07:40+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -195,6 +195,12 @@ msgstr "" msgid " Likes" msgstr "" +#. module: website_slides +#: code:addons/website_slides/models/slides.py:105 +#, python-format +msgid "

This channel is private and its content is restricted to some users.

" +msgstr "" + #. module: website_slides #: model:ir.ui.view,arch_db:website_slides.slide_detail_view msgid "0\n" diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py index cb2d1836de2..b9d4aa2d757 100644 --- a/addons/website_slides/models/slides.py +++ b/addons/website_slides/models/slides.py @@ -102,7 +102,8 @@ class Channel(models.Model): string='Channel Groups', help="Groups allowed to see presentations in this channel") access_error_msg = fields.Html( 'Error Message', help="Message to display when not accessible due to access rights", - default="

This channel is private and its content is restricted to some users.

", translate=html_translate, sanitize_attributes=False) + default=lambda s: _("

This channel is private and its content is restricted to some users.

"), + translate=html_translate, sanitize_attributes=False) upload_group_ids = fields.Many2many( 'res.groups', 'rel_upload_groups', 'channel_id', 'group_id', string='Upload Groups', help="Groups allowed to upload presentations in this channel. If void, every user can upload.")