diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index a42f96c0616..5177e99cba0 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:59+0000\n"
-"PO-Revision-Date: 2016-09-29 13:59+0000\n"
+"POT-Creation-Date: 2016-10-10 08:43+0000\n"
+"PO-Revision-Date: 2016-10-10 08:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
#. module: account
#: model:mail.template,body_html:account.email_template_edi_invoice
msgid "\n"
-"
Dear ${object.partner_id.name}\n"
"% set access_action = object.get_access_action()\n"
"% set access_url = access_action['type'] == 'ir.actions.act_url' and access_action['url'] or '/report/pdf/account.report_invoice/' + str(object.id)\n"
"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
@@ -190,7 +190,7 @@ msgid "\n"
" \n"
"
\n"
" \n"
-" \n"
+" \n"
" \n"
" \n"
" \n"
@@ -221,7 +221,7 @@ msgid "\n"
" \n"
" \n"
" \n"
-" \n"
+" \n"
" \n"
" \n"
" ${user.company_id.name} \n"
@@ -768,13 +768,13 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1377
+#: code:addons/account/models/account_invoice.py:1379
#, python-format
msgid "A Payment Term should have its last line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1380
+#: code:addons/account/models/account_invoice.py:1382
#, python-format
msgid "A Payment Term should have only one line of type Balance."
msgstr ""
@@ -3112,8 +3112,8 @@ msgid "Currency as per company's country."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1318
-#: code:addons/account/models/account_move.py:1328
+#: code:addons/account/models/account_move.py:1320
+#: code:addons/account/models/account_move.py:1330
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -3670,7 +3670,7 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:890
+#: code:addons/account/models/account_invoice.py:892
#, python-format
msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/refund."
msgstr ""
@@ -4697,7 +4697,7 @@ msgid "Invite Users"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:940
+#: code:addons/account/models/account_invoice.py:942
#: model:ir.model,name:account.model_account_invoice
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id
#: model:ir.model.fields,field_description:account.field_res_partner_invoice_warn
@@ -4774,37 +4774,37 @@ msgid "Invoice id"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:550
+#: code:addons/account/models/account_invoice.py:552
#, python-format
msgid "Invoice must be a draft in order to set it to Pro-forma."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:530
+#: code:addons/account/models/account_invoice.py:532
#, python-format
msgid "Invoice must be cancelled in order to reset it to draft."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:558
+#: code:addons/account/models/account_invoice.py:560
#, python-format
msgid "Invoice must be in draft or Pro-forma state in order to validate it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:582
+#: code:addons/account/models/account_invoice.py:584
#, python-format
msgid "Invoice must be in draft,Pro-forma or open state in order to be cancelled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:576
+#: code:addons/account/models/account_invoice.py:578
#, python-format
msgid "Invoice must be paid in order to set it to register payemnt."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:568
+#: code:addons/account/models/account_invoice.py:570
#, python-format
msgid "Invoice must be validated in order to set it to register payemnt."
msgstr ""
@@ -4821,7 +4821,7 @@ msgid "Invoice refund"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1466
+#: code:addons/account/models/account_invoice.py:1468
#, python-format
msgid "Invoice sent"
msgstr ""
@@ -5790,7 +5790,7 @@ msgid "Move line ids"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1144
+#: code:addons/account/models/account_move.py:1146
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
@@ -5872,7 +5872,7 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1121
+#: code:addons/account/models/account_move.py:1123
#, python-format
msgid "New expected payment date: "
msgstr ""
@@ -5898,7 +5898,7 @@ msgid "No Message"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1064
+#: code:addons/account/models/account_invoice.py:1066
#, python-format
msgid "No appropriate payment method enabled on journal %s"
msgstr ""
@@ -6685,7 +6685,7 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1448
+#: code:addons/account/models/account_invoice.py:1450
#, python-format
msgid "Percentages for Payment Terms Line must be between 0 and 100."
msgstr ""
@@ -6723,7 +6723,7 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:795
+#: code:addons/account/models/account_invoice.py:797
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -6735,7 +6735,7 @@ msgid "Please define a sequence on the journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:793
+#: code:addons/account/models/account_invoice.py:795
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
@@ -7206,7 +7206,7 @@ msgid "Reference/Description"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:942
+#: code:addons/account/models/account_invoice.py:944
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
@@ -8439,7 +8439,7 @@ msgid "The selected account of your Journal Entry forces to provide a secondary
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1309
+#: code:addons/account/models/account_invoice.py:1311
#, python-format
msgid "The selected unit of measure is not compatible with the unit of measure of the product."
msgstr ""
@@ -8494,7 +8494,7 @@ msgid "These users handle billing specifically."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1041
+#: code:addons/account/models/account_invoice.py:1043
#, python-format
msgid "This %s has been created from: %s"
msgstr ""
@@ -9161,7 +9161,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:941
+#: code:addons/account/models/account_invoice.py:943
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -9202,7 +9202,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:943
+#: code:addons/account/models/account_invoice.py:945
#: code:addons/account/models/account_payment.py:491
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -9244,7 +9244,7 @@ msgid "Warning"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:494
+#: code:addons/account/models/account_invoice.py:496
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -9255,8 +9255,8 @@ msgid "Warning on the Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1249
-#: code:addons/account/models/account_invoice.py:1308
+#: code:addons/account/models/account_invoice.py:1251
+#: code:addons/account/models/account_invoice.py:1310
#, python-format
msgid "Warning!"
msgstr ""
@@ -9435,7 +9435,7 @@ msgid "You cannot add/modify entries prior to and inclusive of the lock date %s.
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:922
+#: code:addons/account/models/account_invoice.py:924
#, python-format
msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
msgstr ""
@@ -9471,14 +9471,14 @@ msgid "You cannot do that on an account that contains journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1146
+#: code:addons/account/models/account_move.py:1148
#, python-format
msgid "You cannot do this modification on a posted journal entry, you can just change some non legal fields. You must revert the journal entry to cancel it.\n"
"%s."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1148
+#: code:addons/account/models/account_move.py:1150
#, python-format
msgid "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n"
"%s."
@@ -9518,7 +9518,7 @@ msgid "You cannot modify a posted entry of this journal.\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:570
+#: code:addons/account/models/account_invoice.py:572
#, python-format
msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first."
msgstr ""
@@ -9536,14 +9536,14 @@ msgid "You cannot remove/deactivate an account which is set on a customer or ven
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1006
-#: code:addons/account/models/account_move.py:1112
+#: code:addons/account/models/account_move.py:1008
+#: code:addons/account/models/account_move.py:1114
#, python-format
msgid "You cannot use deprecated account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1044
+#: code:addons/account/models/account_move.py:1046
#, python-format
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
msgstr ""
@@ -9561,7 +9561,7 @@ msgid "You must define a Start Date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1250
+#: code:addons/account/models/account_invoice.py:1252
#, python-format
msgid "You must first select a partner!"
msgstr ""
@@ -9579,19 +9579,19 @@ msgid "You must set a start date."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1302
+#: code:addons/account/models/account_move.py:1304
#, python-format
msgid "You should configure the 'Exchange Rate Journal' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1304
+#: code:addons/account/models/account_move.py:1306
#, python-format
msgid "You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1306
+#: code:addons/account/models/account_move.py:1308
#, python-format
msgid "You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index 71cf62c7287..47087a6433d 100644
--- a/addons/auth_signup/i18n/auth_signup.pot
+++ b/addons/auth_signup/i18n/auth_signup.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:56+0000\n"
-"PO-Revision-Date: 2016-09-07 08:56+0000\n"
+"POT-Creation-Date: 2016-10-10 08:43+0000\n"
+"PO-Revision-Date: 2016-10-10 08:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgid "\n"
" A password reset was requested for the Odoo account linked to this email. \n"
" You may change your password by following this link which will remain valid during 24 hours: \n"
" \n"
" If you do not expect this, you can safely ignore this email. \n"
" Best regards, \n"
@@ -40,7 +40,7 @@ msgid "\n"
"\n"
" ${user.signature | safe}\n"
" \n"
-" Sent by ${user.company_id.name} using Odoo\n"
+" Sent by ${user.company_id.name} using Odoo\n"
" \n"
" "
msgstr ""
@@ -66,14 +66,14 @@ msgid "\n"
" To accept the invitation, click on the following link:\n"
" \n"
" \n"
" Best regards, \n"
"\n"
"\n"
" ${user.signature | safe}\n"
" \n"
-" Sent by ${user.company_id.name} using Odoo\n"
+" Sent by ${user.company_id.name} using Odoo\n"
" \n"
" "
msgstr ""
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index 2f10148d91c..2c2ec04f84f 100644
--- a/addons/calendar/i18n/calendar.pot
+++ b/addons/calendar/i18n/calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:58+0000\n"
-"PO-Revision-Date: 2016-09-07 08:58+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,9 +27,9 @@ msgid "\n"
" | \n"
" \n"
" \n"
-" Accept\n"
-" Decline\n"
-" View\n"
+" Accept\n"
+" Decline\n"
+" View\n"
" \n"
" | \n"
" \n"
@@ -55,14 +55,14 @@ msgid "\n"
" \n"
" \n"
" \n"
-" \n"
+" \n"
" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" \n"
-" \n"
+" \n"
" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" \n"
-" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)} \n"
-" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''} \n"
+" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)} \n"
+" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''} \n"
" | \n"
" \n"
" | \n"
@@ -113,9 +113,9 @@ msgid "\n"
" | \n"
" \n"
" \n"
-" Accept\n"
-" Decline\n"
-" View\n"
+" Accept\n"
+" Decline\n"
+" View\n"
" \n"
" | \n"
" \n"
@@ -140,14 +140,14 @@ msgid "\n"
" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.\n"
" \n"
" \n"
-" \n"
+" \n"
" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" \n"
-" \n"
+" \n"
" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" \n"
-" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)} \n"
-" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''} \n"
+" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)} \n"
+" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''} \n"
" | \n"
" \n"
" | \n"
@@ -198,9 +198,9 @@ msgid "\n"
" | \n"
" \n"
" \n"
-" Accept\n"
-" Decline\n"
-" View\n"
+" Accept\n"
+" Decline\n"
+" View\n"
" \n"
" | \n"
" \n"
@@ -226,14 +226,14 @@ msgid "\n"
" \n"
" \n"
" \n"
-" \n"
+" \n"
" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" \n"
-" \n"
+" \n"
" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" \n"
-" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)} \n"
-" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''} \n"
+" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)} \n"
+" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''} \n"
" | \n"
" \n"
" | \n"
@@ -394,7 +394,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1475
+#: code:addons/calendar/models/calendar.py:1476
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -628,7 +628,7 @@ msgid "Event alarm"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1058
+#: code:addons/calendar/models/calendar.py:1059
#, python-format
msgid "Event recurrence interval cannot be negative."
msgstr ""
@@ -656,7 +656,7 @@ msgid "First"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:860
+#: code:addons/calendar/models/calendar.py:861
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
@@ -693,7 +693,7 @@ msgid "Group By"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1423
+#: code:addons/calendar/models/calendar.py:1424
#, python-format
msgid "Group by date is not supported, use the calendar view instead."
msgstr ""
@@ -964,7 +964,7 @@ msgid "Partner"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1071
+#: code:addons/calendar/models/calendar.py:1072
#, python-format
msgid "Please select a proper day of the month."
msgstr ""
@@ -1299,7 +1299,7 @@ msgid "e.g. Business Lunch"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1056
+#: code:addons/calendar/models/calendar.py:1057
#, python-format
msgid "interval cannot be negative."
msgstr ""
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index d2fada0b4b1..43e8fabcb28 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-19 12:33+0000\n"
-"PO-Revision-Date: 2016-09-19 12:33+0000\n"
+"POT-Creation-Date: 2016-10-10 08:42+0000\n"
+"PO-Revision-Date: 2016-10-10 08:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "\n"
" \n"
" | \n"
" \n"
-" Auto Login\n"
+" Auto Login\n"
" | \n"
" \n"
" \n"
@@ -37,7 +37,7 @@ msgid "\n"
" \n"
" \n"
" | \n"
-" Hooray! \n"
+" Hooray! \n"
" \n"
" Your Odoo CRM application is up and running. \n"
" \n"
@@ -62,7 +62,7 @@ msgid "\n"
" \n"
" CRM planner\n"
" to activate extra features\n"
-" (${user.env['web.planner'].get_planner_progress('planner_crm')}% done)\n"
+" (${user.env['web.planner'].get_planner_progress('planner_crm')}% done)\n"
" \n"
" \n"
" - \n"
@@ -1212,9 +1212,11 @@ msgid "Convert to opportunities"
msgstr ""
#. module: crm
+#: code:addons/crm/models/crm_lead.py:1038
#: selection:crm.lead2opportunity.partner,name:0
#: selection:crm.lead2opportunity.partner.mass,name:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
+#, python-format
msgid "Convert to opportunity"
msgstr ""
@@ -1373,7 +1375,7 @@ msgid "Current Line"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1085
+#: code:addons/crm/models/crm_lead.py:1073
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2projectissue_wizard_partner_id
@@ -1389,7 +1391,7 @@ msgid "Customer"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1087
+#: code:addons/crm/models/crm_lead.py:1075
#, python-format
msgid "Customer Email"
msgstr ""
@@ -2289,9 +2291,11 @@ msgid "Log an Activity"
msgstr ""
#. module: crm
+#: code:addons/crm/models/crm_lead.py:1044
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+#, python-format
msgid "Lost"
msgstr ""
@@ -2607,7 +2611,7 @@ msgid "Next activity late"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1107
+#: code:addons/crm/models/crm_lead.py:1095
#, python-format
msgid "No Subject"
msgstr ""
@@ -3957,12 +3961,14 @@ msgid "Wizard"
msgstr ""
#. module: crm
+#: code:addons/crm/models/crm_lead.py:1043
#: model:crm.stage,name:crm.stage_lead4
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+#, python-format
msgid "Won"
msgstr ""
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index 4ecfb7f23f7..2280f2a5cdd 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 14:00+0000\n"
-"PO-Revision-Date: 2016-09-29 14:00+0000\n"
+"POT-Creation-Date: 2016-10-10 08:43+0000\n"
+"PO-Revision-Date: 2016-10-10 08:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgid "\n"
"
\n"
" Please keep in mind that the event\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
-" ${object.event_id.name}\n"
+" ${object.event_id.name}\n"
" % else:\n"
" ${object.event_id.name}\n"
" % endif\n"
@@ -104,7 +104,7 @@ msgid "\n"
" \n"
" \n"
" Questions about this event?\n"
-" \n"
+" \n"
" | \n"
" \n"
" | \n"
@@ -113,9 +113,9 @@ msgid "\n"
" \n"
" \n"
" Add this event to your calendar\n"
-" Google\n"
-" Outlook\n"
-" Yahoo\n"
+" Google\n"
+" Outlook\n"
+" Yahoo\n"
" | \n"
" \n"
" \n"
@@ -132,7 +132,7 @@ msgid "\n"
" \n"
" \n"
" | \n"
-" \n"
+" \n"
" Copyright © ${object.company_id.name} \n"
" | \n"
" \n"
@@ -171,7 +171,7 @@ msgid "\n"
" \n"
" Hi ${object.name}, here is your order confirmation for\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
-" ${object.event_id.name}\n"
+" ${object.event_id.name}\n"
" % else:\n"
" ${object.event_id.name}\n"
" % endif\n"
@@ -226,7 +226,7 @@ msgid "\n"
" \n"
" \n"
" Questions about this event?\n"
-" \n"
+" \n"
" | \n"
" \n"
" \n"
@@ -235,9 +235,9 @@ msgid "\n"
" \n"
" \n"
" Add this event to your calendar\n"
-" Google\n"
-" Outlook\n"
-" Yahoo\n"
+" Google\n"
+" Outlook\n"
+" Yahoo\n"
" | \n"
" \n"
" \n"
@@ -254,7 +254,7 @@ msgid "\n"
" \n"
" \n"
" | \n"
-" \n"
+" \n"
" Copyright © ${object.company_id.name} \n"
" | \n"
" \n"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index 9dd2b23989d..824e1e820be 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:56+0000\n"
-"PO-Revision-Date: 2016-09-07 08:56+0000\n"
+"POT-Creation-Date: 2016-10-10 08:43+0000\n"
+"PO-Revision-Date: 2016-10-10 08:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -747,7 +747,7 @@ msgstr ""
#. module: hr
#: model:res.groups,name:hr.group_hr_attendance
-msgid "Manual Attendances"
+msgid "Manual Attendance"
msgstr ""
#. module: hr
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 1565e6d9846..0826c2f10c3 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:56+0000\n"
-"PO-Revision-Date: 2016-09-07 08:56+0000\n"
+"POT-Creation-Date: 2016-10-10 08:43+0000\n"
+"PO-Revision-Date: 2016-10-10 08:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,14 +35,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:108
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:108
#, python-format
msgid "An apple a day keeps the doctor away"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:97
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:97
#, python-format
msgid "Another good day's work! See you soon!"
msgstr ""
@@ -53,7 +53,7 @@ msgid "Apply"
msgstr ""
#. module: hr_attendance
-#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_my_main_menu
+#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_my_attendances
#: model:ir.model,name:hr_attendance.model_hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_attendance_state
#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_graph
@@ -79,7 +79,7 @@ msgstr ""
#. module: hr_attendance
#: model:ir.actions.act_window,name:hr_attendance.hr_attendance_action
-#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_main_menu
+#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_kiosk_mode
#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_root
#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_view_attendances
#: model:ir.ui.view,arch_db:hr_attendance.hr_department_view_kanban
@@ -110,13 +110,13 @@ msgid "Cannot create new attendance record for %(empl_name)s, the employee was a
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:113
+#: code:addons/hr_attendance/models/hr_employee.py:111
#, python-format
msgid "Cannot perform check in or check out on multiple employees."
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:131
+#: code:addons/hr_attendance/models/hr_employee.py:125
#, python-format
msgid "Cannot perform check out on %(empl_name)s, could not find corresponding check in. Your attendances have probably been modified manually by human resources."
msgstr ""
@@ -224,14 +224,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:114
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:114
#, python-format
msgid "Early to bed and early to rise, makes a man healthy, wealthy and wise"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:106
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:106
#, python-format
msgid "Eat breakfast as a king, lunch as a merchant and supper as a beggar"
msgstr ""
@@ -273,12 +273,12 @@ msgstr ""
#. module: hr_attendance
#: selection:base.config.settings,group_attendance_use_pin:0
-msgid "Employees do not need to enter their PIN to check in manually in the \"Company Screen\"."
+msgid "Employees do not need to enter their PIN to check in manually in the \"Kiosk Mode\"."
msgstr ""
#. module: hr_attendance
#: selection:base.config.settings,group_attendance_use_pin:0
-msgid "Employees must enter their PIN to check in manually in the \"Company Screen\"."
+msgid "Employees must enter their PIN to check in manually in the \"Kiosk Mode\"."
msgstr ""
#. module: hr_attendance
@@ -293,7 +293,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/my_main_menu.js:29
+#: code:addons/hr_attendance/static/src/js/my_attendances.js:29
#, python-format
msgid "Error : Could not find employee linked to user"
msgstr ""
@@ -314,43 +314,43 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:61
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:61
#, python-format
msgid "First come, first served"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:77
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:77
#, python-format
msgid "Glad to have you back, it's been a while!"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:68
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:68
#, python-format
msgid "Good afternoon"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:70
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:70
#, python-format
msgid "Good evening"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:65
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:65
#, python-format
msgid "Good morning"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:55
-#: code:addons/hr_attendance/static/src/js/message.js:72
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:55
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:72
#, python-format
msgid "Good night"
msgstr ""
@@ -369,28 +369,28 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:111
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:111
#, python-format
msgid "Have a good afternoon"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:102
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:102
#, python-format
msgid "Have a good day!"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:116
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:116
#, python-format
msgid "Have a good evening"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:104
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:104
#, python-format
msgid "Have a nice lunch!"
msgstr ""
@@ -412,7 +412,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:80
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:80
#, python-format
msgid "If a job is worth doing, it is worth doing well!"
msgstr ""
@@ -425,7 +425,7 @@ msgid "Invalid request, please return to the main menu."
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_Kiosk_mode
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_kiosk_mode
msgid "Kiosk Mode"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Manual Attendance"
msgstr ""
#. module: hr_attendance
-#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_message
+#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_greeting_message
msgid "Message"
msgstr ""
@@ -486,7 +486,7 @@ msgid "No Check Out"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:74
+#: code:addons/hr_attendance/models/hr_employee.py:72
#, python-format
msgid "No employee corresponding to barcode %(barcode)s"
msgstr ""
@@ -503,7 +503,7 @@ msgstr ""
#. module: hr_attendance
#: model:ir.model.fields,help:hr_attendance.field_hr_employee_pin
-msgid "PIN used for Check In/Out in Attendance."
+msgid "PIN used to Check In/Out in Kiosk Mode (if enabled in Configuration)."
msgstr ""
#. module: hr_attendance
@@ -562,7 +562,7 @@ msgid "The Badge ID must be unique, this one is already assigned to another empl
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:65
+#: code:addons/hr_attendance/models/hr_employee.py:63
#, python-format
msgid "The PIN must be a sequence of digits."
msgstr ""
@@ -574,14 +574,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:59
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:59
#, python-format
msgid "The early bird catches the worm"
msgstr ""
#. module: hr_attendance
#: model:ir.model.fields,help:hr_attendance.field_hr_employee_manual_attendance
-msgid "The employee will have access to the \"My Attendances\" menu to perform his check in and out from his session"
+msgid "The employee will have access to the \"My Attendances\" menu to check in and out from his session"
msgstr ""
#. module: hr_attendance
@@ -596,7 +596,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/message.js:94
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:94
#, python-format
msgid "Warning! Last check in was over 12 hours ago. If this isn't right, please contact Human Resources."
msgstr ""
@@ -623,7 +623,7 @@ msgid "Worked Hours"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:81
+#: code:addons/hr_attendance/models/hr_employee.py:79
#, python-format
msgid "Wrong PIN"
msgstr ""
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 85643f5c680..d5a3d28059c 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:59+0000\n"
-"PO-Revision-Date: 2016-09-29 13:59+0000\n"
+"POT-Creation-Date: 2016-10-10 08:43+0000\n"
+"PO-Revision-Date: 2016-10-10 08:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -34,25 +34,25 @@ msgid "\n"
"\n"
" | \n"
" % if ctx.get('has_button_access'):\n"
-" ${ctx['button_access']['title']}\n"
+" ${ctx['button_access']['title']}\n"
" % endif\n"
"\n"
" % if ctx.get('has_button_follow'):\n"
" % if ctx.get('has_button_access'):\n"
" |\n"
" % endif\n"
-" ${ctx['button_follow']['title']}\n"
+" ${ctx['button_follow']['title']}\n"
" % elif ctx.get('has_button_unfollow'):\n"
" % if ctx.get('has_button_access'):\n"
" |\n"
" % endif\n"
-" ${ctx['button_unfollow']['title']}\n"
+" ${ctx['button_unfollow']['title']}\n"
" % endif\n"
"\n"
" % if ctx.get('actions'):\n"
" % for action in ctx['actions']:\n"
" |\n"
-" ${action['title']}\n"
+" ${action['title']}\n"
" % endfor\n"
" % endif\n"
" | \n"
@@ -90,14 +90,14 @@ msgid "\n"
"\n"
" Sent by\n"
" % if ctx.get('website_url'):\n"
-" \n"
+" \n"
" % endif\n"
" ${ctx.get('company_name')}\n"
" % if ctx.get('website_url'):\n"
" \n"
" % endif\n"
" using\n"
-" Odoo.\n"
+" Odoo.\n"
" \n"
""
msgstr ""
@@ -152,7 +152,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:193
+#: code:addons/mail/static/src/xml/thread.xml:195
#, python-format
msgid "-------- Show older messages --------"
msgstr ""
@@ -483,7 +483,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:194
+#: code:addons/mail/static/src/js/chat_manager.js:195
#, python-format
msgid "Anonymous"
msgstr ""
@@ -1070,7 +1070,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:182
+#: code:addons/mail/static/src/xml/thread.xml:184
#, python-format
msgid "Delete this attachment"
msgstr ""
@@ -1385,7 +1385,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:673
+#: code:addons/mail/models/mail_thread.py:686
#: code:addons/mail/static/src/xml/followers.xml:21
#, python-format
msgid "Follow"
@@ -1873,7 +1873,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:1026
+#: code:addons/mail/static/src/js/chat_manager.js:1027
#: code:addons/mail/static/src/xml/client_action.xml:22
#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
@@ -1900,14 +1900,14 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1763
+#: code:addons/mail/models/mail_thread.py:1776
#, python-format
msgid "Invalid record set: should be called as model (without records) or on single-record recordset"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:619
+#: code:addons/mail/static/src/js/chat_manager.js:620
#, python-format
msgid "Invitation"
msgstr ""
@@ -3411,7 +3411,7 @@ msgid "Rich-text/HTML message"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:807
+#: code:addons/mail/models/mail_thread.py:820
#, python-format
msgid "Routing mail with Message-Id %s: route %s: %s"
msgstr ""
@@ -3623,7 +3623,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:1032
+#: code:addons/mail/static/src/js/chat_manager.js:1033
#: code:addons/mail/static/src/xml/client_action.xml:28
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
@@ -3924,7 +3924,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:677
+#: code:addons/mail/models/mail_thread.py:690
#: code:addons/mail/static/src/xml/followers.xml:23
#, python-format
msgid "Unfollow"
@@ -4098,7 +4098,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:184
+#: code:addons/mail/static/src/xml/thread.xml:186
#, python-format
msgid "Uploading"
msgstr ""
@@ -4146,8 +4146,8 @@ msgid "Users in this channel: %s %s and you."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:645
-#: code:addons/mail/models/mail_thread.py:647
+#: code:addons/mail/models/mail_thread.py:658
+#: code:addons/mail/models/mail_thread.py:660
#: model:ir.ui.view,arch_db:mail.message_user_assigned
#, python-format
msgid "View"
@@ -4256,7 +4256,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:619
+#: code:addons/mail/static/src/js/chat_manager.js:620
#, python-format
msgid "You have been invited to: "
msgstr ""
@@ -4269,14 +4269,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:515
+#: code:addons/mail/static/src/js/chat_manager.js:516
#, python-format
msgid "You unpinned your conversation with %s."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:513
+#: code:addons/mail/static/src/js/chat_manager.js:514
#, python-format
msgid "You unsubscribed from %s."
msgstr ""
@@ -4293,13 +4293,13 @@ msgid "Your template should define email_from"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:941
+#: code:addons/mail/models/mail_thread.py:954
#, python-format
msgid "alias %s does not accept unknown author"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:937
+#: code:addons/mail/models/mail_thread.py:950
#, python-format
msgid "alias %s restricted to internal followers"
msgstr ""
@@ -4387,19 +4387,19 @@ msgid "mention(s) marked as read."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:916
+#: code:addons/mail/models/mail_thread.py:929
#, python-format
msgid "model %s does not accept document creation"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:911
+#: code:addons/mail/models/mail_thread.py:924
#, python-format
msgid "model %s does not accept document update"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:904
+#: code:addons/mail/models/mail_thread.py:917
#, python-format
msgid "model %s does not accept document update, fall back on document creation"
msgstr ""
@@ -4430,13 +4430,13 @@ msgid "on"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:886
+#: code:addons/mail/models/mail_thread.py:899
#, python-format
msgid "posting a message without model should be with a null res_id (private message), received %s"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:890
+#: code:addons/mail/models/mail_thread.py:903
#, python-format
msgid "posting a message without model should be with a parent_id (private message)"
msgstr ""
@@ -4471,19 +4471,19 @@ msgid "record:"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:908
+#: code:addons/mail/models/mail_thread.py:921
#, python-format
msgid "reply to missing document (%s,%s)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:901
+#: code:addons/mail/models/mail_thread.py:914
#, python-format
msgid "reply to missing document (%s,%s), fall back on new document creation"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:886
+#: code:addons/mail/models/mail_thread.py:899
#, python-format
msgid "resetting thread_id"
msgstr ""
@@ -4494,12 +4494,12 @@ msgid "sales"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:890
-#: code:addons/mail/models/mail_thread.py:908
-#: code:addons/mail/models/mail_thread.py:911
-#: code:addons/mail/models/mail_thread.py:916
-#: code:addons/mail/models/mail_thread.py:937
-#: code:addons/mail/models/mail_thread.py:941
+#: code:addons/mail/models/mail_thread.py:903
+#: code:addons/mail/models/mail_thread.py:921
+#: code:addons/mail/models/mail_thread.py:924
+#: code:addons/mail/models/mail_thread.py:929
+#: code:addons/mail/models/mail_thread.py:950
+#: code:addons/mail/models/mail_thread.py:954
#, python-format
msgid "skipping"
msgstr ""
@@ -4512,7 +4512,7 @@ msgid "this document"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:879
+#: code:addons/mail/models/mail_thread.py:892
#, python-format
msgid "unknown target model %s"
msgstr ""
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index 625739ff65a..6f0e7e4c73a 100644
--- a/addons/mass_mailing/i18n/mass_mailing.pot
+++ b/addons/mass_mailing/i18n/mass_mailing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 14:01+0000\n"
-"PO-Revision-Date: 2016-09-29 14:01+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,8 +45,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
-#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social
-#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social_left
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_header_social
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_header_text_social
@@ -74,20 +72,13 @@ msgid " \n"
" "
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "1958 Royal"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
msgid "20%"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
msgid "21 Jul"
msgstr ""
@@ -146,19 +137,16 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
msgid "Step 1:"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
msgid "Step 2:"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
msgid "Step 3:"
msgstr ""
@@ -203,11 +191,6 @@ msgstr ""
msgid "Total management"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "A delicious soup made of one or more seasonal vegetables, without added fat, starches and lactose."
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_three_cols
msgid "A short description"
@@ -230,7 +213,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
msgid "ALL DAY"
msgstr ""
@@ -291,11 +273,6 @@ msgstr ""
msgid "Attendee"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "BBQ Mix"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
msgid "Basic features"
@@ -338,11 +315,6 @@ msgstr ""
msgid "Bounced ratio"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "Call for Speakers"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3681
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
@@ -381,11 +353,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "Captain’s Salad"
-msgstr ""
-
#. module: mass_mailing
#. openerp-web
#: code:addons/mass_mailing/static/src/xml/mass_mailing.xml:5
@@ -393,11 +360,6 @@ msgstr ""
msgid "Change Style"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "Check the top electric guitar brands and their models!"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_sub
msgid "Check this out!"
@@ -405,15 +367,9 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
msgid "Choose"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "Classic D8 Skate"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_lists
msgid "Click here to create a new mailing list."
@@ -489,8 +445,6 @@ msgid "Configure Mass Mailing"
msgstr ""
#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social
-#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social_left
#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Contact"
msgstr ""
@@ -636,16 +590,6 @@ msgstr ""
msgid "Discount Code: 45A9E77DGW8455"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "Discover"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "Discover the new version of our software, with a great overview on all the new features."
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mail_channel
msgid "Discussion channel"
@@ -741,7 +685,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
msgid "Enjoy!"
msgstr ""
@@ -783,7 +726,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
msgid "FROM YOUR NEXT ORDER!"
msgstr ""
@@ -825,11 +767,6 @@ msgstr ""
msgid "Get your inside sales (CRM) fully integrated with online sales (eCommerce), in-store sales (Point of Sale) and marketplaces like eBay and Amazon."
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "Gibson Les Paul Junior"
-msgstr ""
-
#. module: mass_mailing
#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest."
@@ -854,16 +791,6 @@ msgstr ""
msgid "Group By..."
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "Heat up the popcorn and get ready for an immersive experience."
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "Hi there!"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_hr_department
msgid "Hr Department"
@@ -1101,11 +1028,6 @@ msgstr ""
msgid "Mailings"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "Mains"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_maintenance_request
msgid "Maintenance Requests"
@@ -1251,11 +1173,6 @@ msgstr ""
msgid "Michael Fletcher"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "Mini Hamburgers"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
msgid "More"
@@ -1263,7 +1180,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
msgid "More Info"
msgstr ""
@@ -1285,11 +1201,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
-msgid "New 45Hc-270A laptop"
-msgstr ""
-
#. module: mass_mailing
#: model:mail.mass_mailing.campaign,name:mass_mailing.mass_mail_campaign_1
#: model:mail.template,subject:mass_mailing.newsletter_template
@@ -1312,11 +1223,6 @@ msgstr ""
msgid "No support"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
-msgid "Normally mirrorless cameras have always sat slightly above entry-level in terms of price.."
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_clicks_ratio
msgid "Number of Clicks"
@@ -1334,7 +1240,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
msgid "OFF"
msgstr ""
@@ -1343,11 +1248,6 @@ msgstr ""
msgid "OFF YOUR NEXT ORDER!"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "Odoo Experience is the place to be to showcase your expertize."
-msgstr ""
-
#. module: mass_mailing
#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1
#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_2
@@ -1395,7 +1295,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
msgid "Order"
msgstr ""
@@ -1445,34 +1344,16 @@ msgstr ""
msgid "Preferred Reply-To Address"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "Premium Pass"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_template_form_minimal
msgid "Preview"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "Puccini Jar"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "Read More"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_image_text
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_text_image
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_three_cols
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_two_cols
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
msgid "Read More..."
msgstr ""
@@ -1489,11 +1370,6 @@ msgstr ""
msgid "Received Ratio"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "Recipe of the day"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_recipient
msgid "Recipient"
@@ -1517,14 +1393,8 @@ msgstr ""
msgid "Redeem Discount!"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "Register Now!"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
msgid "Registration"
msgstr ""
@@ -1733,11 +1603,6 @@ msgstr ""
msgid "Shipping"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "Sony BDVE210"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_source_id
msgid "Source"
@@ -1759,11 +1624,6 @@ msgstr ""
msgid "Stage"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "Starters"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_state
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
@@ -1820,11 +1680,6 @@ msgstr ""
msgid "Tag name already exists !"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "Tagliatelle Boscaiola"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_tag_ids
msgid "Tags"
@@ -1863,27 +1718,11 @@ msgstr ""
msgid "That way, Odoo evolves much faster than any other solution."
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
-msgid "The Rise Of The Drone"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_opt_out
msgid "The contact has chosen not to receive mails anymore from this list"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
-msgid "The new laptops look nearly identical to the original models, but closer inspection reveals a refined design."
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "The next edition of Odoo Experience looks very promising. More than 150 talks are scheduled during those 3 days!\n"
-" Find below some stand-out talks for the Business tracks."
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
msgid "The open source model of Odoo has allowed us to leverage thousands of developers and\n"
@@ -1895,11 +1734,6 @@ msgstr ""
msgid "The open source model of Odoo has allowed us to leverage thousands of developers and business experts to build hundreds of apps in just a few years."
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
-msgid "They sit at terminals at Holloman Air Force Base, watching grainy images from a drone video feed."
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_medium_id
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_medium_id
@@ -1918,7 +1752,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
-msgid "This mass mailing is scheduled to"
+msgid "This mass mailing is scheduled for"
msgstr ""
#. module: mass_mailing
@@ -1927,26 +1761,11 @@ msgstr ""
msgid "This name helps you tracking your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "This pass gives you access to the catering and evening activities!"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "This will send the email to all recipients. Do you still want to proceed ?"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-msgid "To stir up your curiosity, have a look at all the great talks scheduled and highlighted in our agenda!"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-msgid "Tomato Soup"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_total
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_total
@@ -1963,11 +1782,6 @@ msgstr ""
msgid "Tracking"
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
-msgid "Two-lens phone cameras"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social_left
@@ -2006,11 +1820,6 @@ msgstr ""
msgid "We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button."
msgstr ""
-#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-msgid "We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button."
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
msgid "We want to take this opportunity to welcome you to our ever-growing community! "
@@ -2047,20 +1856,13 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_banner
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
msgid "Your Banner Image"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_header_logo
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_header_social
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
#: model:ir.ui.view,arch_db:mass_mailing.theme_default_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
msgid "Your Logo"
msgstr ""
@@ -2071,10 +1873,6 @@ msgstr ""
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_text_image
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_three_cols
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_two_cols
-#: model:ir.ui.view,arch_db:mass_mailing.theme_airmail_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_newsletter_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_resto_template
-#: model:ir.ui.view,arch_db:mass_mailing.theme_tech_template
msgid "Your Picture"
msgstr ""
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index be3addc4041..5123568e86d 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:59+0000\n"
-"PO-Revision-Date: 2016-09-29 13:59+0000\n"
+"POT-Creation-Date: 2016-10-10 08:42+0000\n"
+"PO-Revision-Date: 2016-10-10 08:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -529,7 +529,7 @@ msgid "Cancelled"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:260
+#: code:addons/mrp/models/mrp_production.py:263
#, python-format
msgid "Cannot delete a manufacturing order not in cancel state"
msgstr ""
@@ -565,6 +565,13 @@ msgstr ""
msgid "Check availability"
msgstr ""
+#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:9
+#, python-format
+msgid "Clear"
+msgstr ""
+
#. module: mrp
#: model:ir.actions.act_window,help:mrp.action_work_orders
#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -1300,7 +1307,7 @@ msgid "Late"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:365
+#: code:addons/mrp/models/mrp_production.py:368
#, python-format
msgid "Lines need to be deleted, but can not as you still have some quantities to consume in them. "
msgstr ""
@@ -1584,7 +1591,7 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:46
-#: code:addons/mrp/models/mrp_production.py:250
+#: code:addons/mrp/models/mrp_production.py:253
#: code:addons/mrp/models/mrp_routing.py:18
#: code:addons/mrp/models/mrp_routing.py:34
#: code:addons/mrp/models/mrp_routing.py:35
@@ -2184,7 +2191,7 @@ msgstr ""
#. module: mrp
#. openerp-web
-#: code:addons/mrp/static/src/js/mrp.js:22
+#: code:addons/mrp/static/src/js/mrp.js:24
#, python-format
msgid "Ready to produce"
msgstr ""
@@ -2230,7 +2237,7 @@ msgid "Reference of the document that generated this production order request."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/stock_move.py:281
+#: code:addons/mrp/models/stock_move.py:284
#, python-format
msgid "Register Lots"
msgstr ""
@@ -2365,7 +2372,7 @@ msgid "Scheduled Month"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:539
+#: code:addons/mrp/models/mrp_production.py:542
#: code:addons/mrp/models/mrp_workorder.py:433
#: model:ir.ui.menu,name:mrp.menu_mrp_scrap
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
@@ -2427,6 +2434,14 @@ msgstr ""
msgid "Security days for each manufacturing operation."
msgstr ""
+#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:7
+#: code:addons/mrp/static/src/xml/mrp.xml:8
+#, python-format
+msgid "Select"
+msgstr ""
+
#. module: mrp
#: model:product.product,name:mrp.product_product_build_kit
#: model:product.template,name:mrp.product_product_build_kit_product_template
@@ -2874,6 +2889,20 @@ msgstr ""
msgid "Update"
msgstr ""
+#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:7
+#, python-format
+msgid "Upload your file"
+msgstr ""
+
+#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:6
+#, python-format
+msgid "Uploading..."
+msgstr ""
+
#. module: mrp
#: selection:mrp.production,priority:0
msgid "Urgent"
@@ -2944,7 +2973,7 @@ msgstr ""
#. module: mrp
#. openerp-web
-#: code:addons/mrp/static/src/js/mrp.js:22
+#: code:addons/mrp/static/src/js/mrp.js:24
#, python-format
msgid "Waiting Materials"
msgstr ""
@@ -3120,7 +3149,7 @@ msgid "Work Sheet"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:517
+#: code:addons/mrp/models/mrp_production.py:520
#, python-format
msgid "Work order %s is still running"
msgstr ""
@@ -3196,7 +3225,7 @@ msgid "You can configure by-products in the bill of material.\n"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:455
+#: code:addons/mrp/models/mrp_production.py:458
#, python-format
msgid "You can not cancel production order, a work order is still in progress."
msgstr ""
@@ -3215,7 +3244,7 @@ msgid "You can not delete a Bill of Material with running manufacturing orders.\
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/stock_move.py:122
+#: code:addons/mrp/models/stock_move.py:123
#, python-format
msgid "You cannot cancel a move move having already consumed material"
msgstr ""
@@ -3250,6 +3279,12 @@ msgstr ""
msgid "You need to provide a lot for the finished product"
msgstr ""
+#. module: mrp
+#: code:addons/mrp/models/stock_move.py:246
+#, python-format
+msgid "You need to supply a lot/serial number."
+msgstr ""
+
#. module: mrp
#: code:addons/mrp/wizard/mrp_product_produce.py:78
#, python-format
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 5c2f2ce8043..59e7e307ecc 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:59+0000\n"
-"PO-Revision-Date: 2016-09-29 13:59+0000\n"
+"POT-Creation-Date: 2016-10-10 08:42+0000\n"
+"PO-Revision-Date: 2016-10-10 08:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgid "\n"
" \n"
" \n"
" \n"
-" Auto Login\n"
+" Auto Login\n"
" | \n"
" \n"
" \n"
@@ -64,7 +64,7 @@ msgid "\n"
" \n"
" project planner\n"
" to activate extra features\n"
-" (${user.env['web.planner'].get_planner_progress('planner_project')}% done)\n"
+" (${user.env['web.planner'].get_planner_progress('planner_project')}% done)\n"
" \n"
" \n"
" - \n"
diff --git a/addons/rating_project/i18n/rating_project.pot b/addons/rating_project/i18n/rating_project.pot
index a034ea86884..8933324a781 100644
--- a/addons/rating_project/i18n/rating_project.pot
+++ b/addons/rating_project/i18n/rating_project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 14:00+0000\n"
-"PO-Revision-Date: 2016-09-29 14:00+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgid "\n"
" % if object.project_id.rating_status == 'periodic':\n"
"
This customer survey is sent ${object.project_id.rating_status_period} as long as the task is in the ${object.stage_id.name} stage.\n"
" % endif\n"
-" Email automatically sent by Odoo Project for ${object.project_id.company_id.name} \n"
+" Email automatically sent by Odoo Project for ${object.project_id.company_id.name} \n"
" \n"
" \n"
" \n"
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 687125ebe26..0491ca308da 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-19 12:34+0000\n"
-"PO-Revision-Date: 2016-09-19 12:34+0000\n"
+"POT-Creation-Date: 2016-10-10 08:42+0000\n"
+"PO-Revision-Date: 2016-10-10 08:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -134,7 +134,7 @@ msgid "\n"
" \n"
" | \n"
" \n"
-" \n"
+" \n"
" \n"
" \n"
" \n"
@@ -165,7 +165,7 @@ msgid "\n"
" \n"
" \n"
" \n"
-" \n"
+" \n"
" \n"
" \n"
" ${user.company_id.name} \n"
@@ -208,7 +208,7 @@ msgstr ""
#. openerp-web
#: code:addons/sale/static/src/js/tour.js:64
#, python-format
-msgid "Confirm the order if the customer purchases. The customer can also confirm the order directly from the email he received. "
+msgid "Confirm the order if the customer purchases. "
msgstr ""
#. module: sale
@@ -1361,13 +1361,13 @@ msgid "Personalize the sales orders and invoice report with categories, subtotal
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:278
+#: code:addons/sale/models/sale.py:276
#, python-format
msgid "Please define an accounting sale journal for this company."
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:786
+#: code:addons/sale/models/sale.py:770
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"."
msgstr ""
@@ -1988,7 +1988,7 @@ msgid "Terms and conditions"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale_analytic.py:86
+#: code:addons/sale/models/sale_analytic.py:84
#, python-format
msgid "The Sale Order %s linked to the Analytic Account must be validated before registering expenses."
msgstr ""
@@ -2034,8 +2034,8 @@ msgid "There is no income account defined for this product: \"%s\". You may have
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:368
-#: code:addons/sale/models/sale.py:372
+#: code:addons/sale/models/sale.py:366
+#: code:addons/sale/models/sale.py:370
#, python-format
msgid "There is no invoicable line."
msgstr ""
@@ -2190,7 +2190,7 @@ msgid "Warning"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:869
+#: code:addons/sale/models/sale.py:853
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -2237,7 +2237,7 @@ msgid "You can not delete a sent quotation or a sales order! Try to cancel it be
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:898
+#: code:addons/sale/models/sale.py:882
#, python-format
msgid "You can not remove a sale order line.\n"
"Discard changes and try setting the quantity to 0."
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index dd681cf3612..f042c898b7d 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:58+0000\n"
-"PO-Revision-Date: 2016-09-07 08:58+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "\n"
" \n"
"Hello, \n"
"We are conducting a survey, and your response would be appreciated. \n"
-"Please, click here to start survey \n"
+"Please, click here to start survey \n"
"Thanks for your participation! \n"
" \n"
" "
@@ -33,7 +33,7 @@ msgid "#Questions"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:136
+#: code:addons/survey/models/survey.py:124
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -186,7 +186,7 @@ msgid "A process is defined for all enterprise flows"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:820
+#: code:addons/survey/models/survey.py:808
#, python-format
msgid "A question cannot be unanswered and skipped"
msgstr ""
@@ -316,7 +316,7 @@ msgid "Clean test answers"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:111
+#: code:addons/survey/models/survey.py:112
#, python-format
msgid "Click here to start survey"
msgstr ""
@@ -719,7 +719,7 @@ msgid "If closed, people won't be able to answer to surveys in this column."
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:485
+#: code:addons/survey/models/survey.py:473
#: model:survey.question,comments_message:survey.feedback_1_1
#: model:survey.question,comments_message:survey.feedback_1_2
#: model:survey.question,comments_message:survey.feedback_2_1
@@ -1592,13 +1592,13 @@ msgid "The 'Usability/Extended View' group hides only optional fields"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:833
+#: code:addons/survey/models/survey.py:821
#, python-format
msgid "The answer must be in the right type"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:499
+#: code:addons/survey/models/survey.py:487
#: model:survey.question,validation_error_msg:survey.feedback_1_1
#: model:survey.question,validation_error_msg:survey.feedback_1_2
#: model:survey.question,validation_error_msg:survey.feedback_2_1
@@ -1684,21 +1684,21 @@ msgid "They help new users to understand Odoo"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:558
+#: code:addons/survey/models/survey.py:546
#: code:addons/survey/tests/test_survey.py:86
#, python-format
msgid "This answer must be an email address"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:602
+#: code:addons/survey/models/survey.py:590
#: code:addons/survey/tests/test_survey.py:107
#, python-format
msgid "This is not a date/time"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:579
+#: code:addons/survey/models/survey.py:567
#: code:addons/survey/tests/test_survey.py:97
#, python-format
msgid "This is not a number"
@@ -1715,7 +1715,7 @@ msgid "This message will be displayed when survey is completed"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:503
+#: code:addons/survey/models/survey.py:491
#: model:survey.question,constr_error_msg:survey.feedback_1_1
#: model:survey.question,constr_error_msg:survey.feedback_1_2
#: model:survey.question,constr_error_msg:survey.feedback_2_1
@@ -1760,6 +1760,7 @@ msgstr ""
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey_title
+#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
msgid "Title"
msgstr ""
@@ -1960,13 +1961,13 @@ msgid "You can share your survey web public link and/or send private invitations
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:330
+#: code:addons/survey/models/survey.py:318
#, python-format
msgid "You cannot send an invitation for a survey that has no questions."
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:333
+#: code:addons/survey/models/survey.py:321
#, python-format
msgid "You cannot send invitations for closed surveys."
msgstr ""
diff --git a/addons/website_blog/i18n/website_blog.pot b/addons/website_blog/i18n/website_blog.pot
index 519d486736d..01f09eba2a5 100644
--- a/addons/website_blog/i18n/website_blog.pot
+++ b/addons/website_blog/i18n/website_blog.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 14:01+0000\n"
-"PO-Revision-Date: 2016-09-29 14:01+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -78,7 +78,7 @@ msgstr ""
#. openerp-web
#: code:addons/website_blog/static/src/js/website.tour.blog.js:53
#, python-format
-msgid "Click on Save to record yoru changes."
+msgid "Click on Save to record your changes."
msgstr ""
#. module: website_blog
@@ -282,7 +282,7 @@ msgstr ""
#. openerp-web
#: code:addons/website_blog/static/src/js/website.tour.blog.js:30
#, python-format
-msgid "Clich here to change your post cover."
+msgid "Click here to change your post cover."
msgstr ""
#. module: website_blog
diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index 8a3ecb484aa..4b556a8481a 100644
--- a/addons/website_forum/i18n/website_forum.pot
+++ b/addons/website_forum/i18n/website_forum.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:58+0000\n"
-"PO-Revision-Date: 2016-09-07 08:58+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgid "\n"
" You have been invited to validate your email in order to get access to\n"
" \"${object.company_id.name}\" Q/A Forums. \n"
" To validate your email, please click on the following link: \n"
-" \n"
+" \n"
" Validate my account for \"${object.company_id.name}\" Q/A Forums\n"
" \n"
" Thanks for your participation! \n"
@@ -1665,14 +1665,14 @@ msgid "Nofollow links"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:874
-#: code:addons/website_forum/models/forum.py:894
+#: code:addons/website_forum/models/forum.py:871
+#: code:addons/website_forum/models/forum.py:891
#, python-format
msgid "Not allowed to vote for its own post"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:938
+#: code:addons/website_forum/models/forum.py:935
#, python-format
msgid "Not enough karma to create a new Tag"
msgstr ""
@@ -2187,7 +2187,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:149
+#: code:addons/website_forum/static/src/js/website_forum.js:168
#, python-format
msgid "Sorry, anonymous users cannot choose correct answer."
msgstr ""
@@ -2523,9 +2523,7 @@ msgid "Validate question"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:801
#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
-#, python-format
msgid "View"
msgstr ""
diff --git a/addons/website_mail/i18n/website_mail.pot b/addons/website_mail/i18n/website_mail.pot
index 5f124123a97..5eb546b4079 100644
--- a/addons/website_mail/i18n/website_mail.pot
+++ b/addons/website_mail/i18n/website_mail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:57+0000\n"
-"PO-Revision-Date: 2016-09-07 08:57+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "\n"
" \n"
" | \n"
" \n"
-" Auto Login\n"
+" Auto Login\n"
" | \n"
" \n"
" \n"
@@ -35,7 +35,7 @@ msgid "\n"
" \n"
" \n"
" | \n"
-" Awesome! \n"
+" Awesome! \n"
" \n"
" Your website is now online! \n"
" \n"
@@ -57,7 +57,7 @@ msgid "\n"
" \n"
" Website planner\n"
" to activate extra features\n"
-" (${user.env['web.planner'].get_planner_progress('planner_website')}% done)\n"
+" (${user.env['web.planner'].get_planner_progress('planner_website')}% done)\n"
" \n"
" \n"
" - \n"
diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
index acafac8dbeb..bf7b6bbd4bb 100644
--- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot
+++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:57+0000\n"
-"PO-Revision-Date: 2016-09-07 08:57+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,22 +16,12 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
msgid "×"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet
-msgid "Newsletter Popup"
-msgstr ""
-
-#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe
-msgid "Newsletter"
-msgstr ""
-
-#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
msgid "Newsletter Popup! The newsletter popup snippet effect is active on this page. Click"
msgstr ""
@@ -55,8 +45,7 @@ msgid "Allow the use of a pop-up snippet on website to encourage visitors to sig
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe
-#: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_options
+#: model:ir.ui.view,arch_db:website_mass_mailing.newsletter_subscribe_options
msgid "Change Newsletter"
msgstr ""
@@ -65,13 +54,19 @@ msgstr ""
msgid "Choose your mailing subscriptions."
msgstr ""
+#. module: website_mass_mailing
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_mail_block_footer_social
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_mail_block_footer_social_left
+msgid "Contact"
+msgstr ""
+
#. module: website_mass_mailing
#: selection:mass.mailing.config.settings,group_website_popup_on_exit:0
msgid "Do not add extra content on website pages to encourage visitors to sign up"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
msgid "Here To Edit Dialog Content"
msgstr ""
@@ -99,18 +94,18 @@ msgid "Popup Content"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe
-#: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_form
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
msgid "Subscribe"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_form
msgid "Thanks"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_form
msgid "Thanks for your subscription!"
msgstr ""
@@ -157,8 +152,8 @@ msgid "mass.mailing.config.settings"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe
-#: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_form
+#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
msgid "your email..."
msgstr ""
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index 729f4e3ebae..f54279fd854 100644
--- a/addons/website_quote/i18n/website_quote.pot
+++ b/addons/website_quote/i18n/website_quote.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:57+0000\n"
-"PO-Revision-Date: 2016-09-07 08:57+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid "\n"
"
Your order ${object.name} has been validated! \n"
" \n"
" % if object.partner_id.user_ids\n"
-" You can view your quotes, sales orders and invoices online by going to our Online Portal. \n"
+" You can view your quotes, sales orders and invoices online by going to our Online Portal. \n"
" % endif\n"
"\n"
" If you have any question, do not hesitate to contact us. \n"
@@ -57,9 +57,9 @@ msgid "\n"
" \n"
" % endif\n"
" Sent by\n"
-" \n"
+" \n"
" ${user.company_id.name}\n"
-" using Odoo\n"
+" using Odoo\n"
" \n"
" | \n"
" \n"
@@ -526,7 +526,6 @@ msgstr ""
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_name
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_name
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_website_description
-#: model:ir.ui.view,arch_db:website_quote.optional_products
#: model:ir.ui.view,arch_db:website_quote.report_saleorder_validity_date
#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
msgid "Description"
@@ -723,8 +722,8 @@ msgid "If edit a quotation from the 'Preview' of a quotation, you will\n"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:78
-#: code:addons/website_quote/controllers/main.py:213
+#: code:addons/website_quote/controllers/main.py:76
+#: code:addons/website_quote/controllers/main.py:211
#, python-format
msgid "If we store your payment information on our server, subscription payments will be made automatically."
msgstr ""
@@ -982,13 +981,13 @@ msgid "Optional Products Lines"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/models/sale_order.py:170
+#: code:addons/website_quote/models/sale_order.py:169
#, python-format
msgid "Order paid by %s. Transaction: %s. Amount: %s."
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:92
+#: code:addons/website_quote/controllers/main.py:90
#, python-format
msgid "Order signed by %s"
msgstr ""
@@ -1051,8 +1050,8 @@ msgid "Participants preferably have a functional knowledge of our software (see
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:67
-#: code:addons/website_quote/controllers/main.py:206
+#: code:addons/website_quote/controllers/main.py:65
+#: code:addons/website_quote/controllers/main.py:204
#, python-format
msgid "Pay & Confirm"
msgstr ""
@@ -1099,6 +1098,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_product_id
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_product_id
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_product_id
+#: model:ir.ui.view,arch_db:website_quote.optional_products
#: model:ir.ui.view,arch_db:website_quote.report_saleorder_validity_date
msgid "Product"
msgstr ""
@@ -1131,7 +1131,6 @@ msgid "Product:"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.optional_products
#: model:ir.ui.view,arch_db:website_quote.pricing
msgid "Products"
msgstr ""
@@ -1200,7 +1199,7 @@ msgid "Quotation Viewed"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:25
+#: code:addons/website_quote/controllers/main.py:26
#, python-format
msgid "Quotation viewed by customer"
msgstr ""
@@ -1533,7 +1532,7 @@ msgid "You can set a description per product. Odoo will\n"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:136
+#: code:addons/website_quote/controllers/main.py:134
#, python-format
msgid "You cannot add options to a confirmed order."
msgstr ""
diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot
index 6b6166eee65..3e4dfa49446 100644
--- a/addons/website_sale/i18n/website_sale.pot
+++ b/addons/website_sale/i18n/website_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:59+0000\n"
-"PO-Revision-Date: 2016-09-29 13:59+0000\n"
+"POT-Creation-Date: 2016-10-10 08:43+0000\n"
+"PO-Revision-Date: 2016-10-10 08:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -75,6 +75,11 @@ msgid "\n"
" My cart"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "Source: https://termsfeed.com/blog/sample-terms-and-conditions-template"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_lines
msgid " Remove"
@@ -82,7 +87,9 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Send\n"
+msgid "\n"
+" Next \n"
+" \n"
" "
msgstr ""
@@ -104,7 +111,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
msgid "\n"
-" Saved Cards"
+" Saved Cards"
msgstr ""
#. module: website_sale
@@ -421,6 +428,26 @@ msgstr ""
msgid "Variants like size or color"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "A Governing Law will inform users which laws govern the agreement. This should the country in which your company is headquartered or the country from which you operate your web site and mobile app."
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "A Limit What Users Can Do clause can inform users that by agreeing to use your service, they’re also agreeing to not do certain things. This can be part of a very long and thorough list in your Terms and Conditions agreements so as to encompass the most amount of negative uses."
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "A Links To Other Web Sites clause will inform users that you are not responsible for any third party web sites that you link to. This kind of clause will generally inform users that they are responsible for reading and agreeing (or disagreeing) with the Terms and Conditions or Privacy Policies of these third parties."
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "A Termination clause will inform that users’ accounts on your website and mobile app or users’ access to your website and mobile (if users can’t have an account with you) can be terminated in case of abuses or at your sole discretion."
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info
msgid "A document to provide ?"
@@ -1046,6 +1073,11 @@ msgstr ""
msgid "Hidden"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.payment_sale_note
+msgid "I agree to the"
+msgstr ""
+
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_image_id
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_id
@@ -1058,6 +1090,11 @@ msgstr ""
msgid "If you deal with a major shipper (UPS, FedEx, DHL, etc.), activate the related connector in Odoo to compute accurate costs and print labels."
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "If your website or mobile apps allows users to create content and make that content public to other users, a Content section will inform users that they own the rights to the content they have created. The “Content” clause usually mentions that users must give you (the website or mobile app developer) a license so that you can share this content on your website/mobile app and to make it available to other users. Because the content created by users is public to other users, a DMCA notice clause (or Copyright Infringement ) section is helpful to inform users and copyright authors that, if any content is found to be a copyright infringement, you will respond to any DMCA take down notices received and you will take down the content."
+msgstr ""
+
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_image_image
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_image
@@ -1226,7 +1263,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/controllers/main.py:953
+#: code:addons/website_sale/controllers/main.py:958
#: code:addons/website_sale/static/src/js/website_sale.editor.js:18
#: model:ir.ui.view,arch_db:website_sale.content_new_product
#, python-format
@@ -2025,11 +2062,21 @@ msgstr ""
msgid "Temando integration"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "Terms & Conditions"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
msgid "Thank you for your order."
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.terms
+msgid "The Intellectual Property disclosure will inform users that the contents, logo and other visual media you created is your property and is protected by copyright laws."
+msgstr ""
+
#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_product_website_url
msgid "The full URL to access the document through the website."
@@ -2395,6 +2442,11 @@ msgstr ""
msgid "product.style"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.payment_sale_note
+msgid "terms & conditions"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "use Odoo API to import through scripts"
diff --git a/addons/website_slides/i18n/website_slides.pot b/addons/website_slides/i18n/website_slides.pot
index 7dc4265d73a..acdf17a336b 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:58+0000\n"
-"PO-Revision-Date: 2016-09-07 08:58+0000\n"
+"POT-Creation-Date: 2016-10-10 08:44+0000\n"
+"PO-Revision-Date: 2016-10-10 08:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "\n"
" \n"
"\n"
"\n"
-" \n"
+" \n"
" View ${object.name}\n"
" \n"
" \n"
@@ -48,7 +48,7 @@ msgid "\n"
" \n"
"\n"
"\n"
-" \n"
+" \n"
" View ${object.name}\n"
" \n"
" \n"
@@ -883,7 +883,7 @@ msgstr ""
#. module: website_slides
#: code:addons/website_slides/models/slides.py:310
-#: code:addons/website_slides/models/slides.py:535
+#: code:addons/website_slides/models/slides.py:533
#, python-format
msgid "Please enter valid Youtube or Google Doc URL"
msgstr ""
@@ -1196,7 +1196,7 @@ msgid "Uncategorized presentation"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:524
+#: code:addons/website_slides/models/slides.py:522
#, python-format
msgid "Unknown document"
msgstr ""
@@ -1251,12 +1251,6 @@ msgstr ""
msgid "Videos"
msgstr ""
-#. module: website_slides
-#: code:addons/website_slides/models/slides.py:449
-#, python-format
-msgid "View Slide"
-msgstr ""
-
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
#: model:ir.ui.view,arch_db:website_slides.slides_grid_view
| | | | |