diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index e09663195e5..5e2070b2f10 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -95,7 +95,7 @@ msgid " * The 'Draft' status is used when a user is encoding a new and unconfirm msgstr "" #. module: account -#: code:addons/account/account.py:1455 +#: code:addons/account/account.py:1468 #, python-format msgid " Centralisation" msgstr "" @@ -143,7 +143,7 @@ msgid "${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a'})" msgstr "" #. module: account -#: code:addons/account/account.py:1848 +#: code:addons/account/account.py:1861 #, python-format msgid "%s (Copy)" msgstr "" @@ -529,7 +529,7 @@ msgid "A period is a fiscal period of time during which accounting entries shoul msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:694 +#: code:addons/account/account_bank_statement.py:736 #, python-format msgid "A selected move line was already reconciled." msgstr "" @@ -566,10 +566,10 @@ msgstr "" #: field:account.move.line.reconcile.select,account_id:0 #: field:account.move.line.unreconcile.select,account_id:0 #: field:account.statement.operation.template,account_id:0 -#: code:addons/account/static/src/js/account_widgets.js:57 -#: code:addons/account/static/src/js/account_widgets.js:63 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:137 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:159 +#: code:addons/account/static/src/js/account_widgets.js:60 +#: code:addons/account/static/src/js/account_widgets.js:66 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:139 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:161 #: view:analytic.entries.report:account.view_analytic_entries_report_search #: field:analytic.entries.report,account_id:0 #: model:ir.model,name:account.model_account_account @@ -1243,7 +1243,7 @@ msgid "All selected journal entries will be validated and posted. It means you w msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:347 +#: code:addons/account/account_bank_statement.py:348 #, python-format msgid "All the account entries lines must be processed in order to close the statement." msgstr "" @@ -1308,10 +1308,10 @@ msgstr "" #: field:account.tax,amount:0 #: field:account.tax.template,amount:0 #: xsl:account.transfer:0 -#: code:addons/account/static/src/js/account_widgets.js:100 -#: code:addons/account/static/src/js/account_widgets.js:105 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:136 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:169 +#: code:addons/account/static/src/js/account_widgets.js:103 +#: code:addons/account/static/src/js/account_widgets.js:108 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:138 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:171 #: field:analytic.entries.report,amount:0 #: field:cash.box.in,amount:0 #: field:cash.box.out,amount:0 @@ -1370,8 +1370,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:113 -#: code:addons/account/static/src/js/account_widgets.js:120 +#: code:addons/account/static/src/js/account_widgets.js:116 +#: code:addons/account/static/src/js/account_widgets.js:123 #, python-format msgid "Analytic Acc." msgstr "" @@ -1692,7 +1692,7 @@ msgid "Average Rate" msgstr "" #. module: account -#: code:addons/account/account.py:3437 +#: code:addons/account/account.py:3450 #: code:addons/account/account_bank.py:94 #, python-format msgid "BNK" @@ -1700,21 +1700,21 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:53 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:54 #, python-format msgid "Back to statements list" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1174 -#: code:addons/account/account_move_line.py:1258 -#: code:addons/account/account_move_line.py:1325 +#: code:addons/account/account_move_line.py:1173 +#: code:addons/account/account_move_line.py:1257 +#: code:addons/account/account_move_line.py:1324 #, python-format msgid "Bad Account!" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:807 +#: code:addons/account/account_invoice.py:819 #, python-format msgid "Bad Total!" msgstr "" @@ -1788,7 +1788,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_bank #: selection:account.bank.accounts.wizard,account_type:0 -#: code:addons/account/account.py:3058 +#: code:addons/account/account.py:3071 #, python-format msgid "Bank" msgstr "" @@ -2108,56 +2108,56 @@ msgid "Cannot %s invoice which is already reconciled, invoice should be unreconc msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1300 +#: code:addons/account/account_move_line.py:1299 #, python-format msgid "Cannot create an automatic sequence for this piece.\n" "Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece." msgstr "" #. module: account -#: code:addons/account/account.py:1541 +#: code:addons/account/account.py:1554 #, python-format msgid "Cannot create move with currency different from .." msgstr "" #. module: account -#: code:addons/account/account.py:1537 +#: code:addons/account/account.py:1550 #, python-format msgid "Cannot create moves for different companies." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:818 +#: code:addons/account/account_invoice.py:830 #, python-format msgid "Cannot create the invoice.\n" "The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:442 -#: code:addons/account/account_invoice.py:536 -#: code:addons/account/account_invoice.py:555 +#: code:addons/account/account_invoice.py:453 +#: code:addons/account/account_invoice.py:547 +#: code:addons/account/account_invoice.py:566 #, python-format msgid "Cannot find a chart of accounts for this company, You should configure it. \n" "Please go to Account Configuration." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:546 +#: code:addons/account/account_move_line.py:551 #, python-format msgid "Cannot find any account journal of \"%s\" type for this company, You should create one.\n" " Please go to Journal Configuration" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:580 +#: code:addons/account/account_invoice.py:591 #, python-format msgid "Cannot find any account journal of type \"%s\" for this company, You should create one.\n" " Please go to Journal Configuration" msgstr "" #. module: account -#: code:addons/account/account.py:3442 +#: code:addons/account/account.py:3455 #, python-format msgid "Cannot generate an unused journal code." msgstr "" @@ -2174,7 +2174,7 @@ msgstr "" #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.entries.report,type:0 #: selection:account.journal,type:0 -#: code:addons/account/account.py:3058 +#: code:addons/account/account.py:3071 #, python-format msgid "Cash" msgstr "" @@ -2229,7 +2229,6 @@ msgid "Category" msgstr "" #. module: account -#: view:account.invoice:account.view_account_invoice_filter #: view:account.invoice.report:account.view_account_invoice_report_search #: field:account.invoice.report,categ_id:0 msgid "Category of Product" @@ -2498,13 +2497,6 @@ msgstr "" msgid "Choose Fiscal Year" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:1257 -#, python-format -msgid "Choose counterpart" -msgstr "" - #. module: account #: view:account.automatic.reconcile:account.account_automatic_reconcile_view1 #: view:account.bank.statement:account.view_bank_statement_form @@ -2547,7 +2539,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:54 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:55 #, python-format msgid "Close the statement" msgstr "" @@ -2742,7 +2734,7 @@ msgid "Complete set of taxes" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:391 +#: code:addons/account/account_invoice.py:402 #, python-format msgid "Compose Email" msgstr "" @@ -2792,9 +2784,9 @@ msgid "Configuration Error" msgstr "" #. module: account -#: code:addons/account/account.py:3518 -#: code:addons/account/account_bank_statement.py:329 -#: code:addons/account/account_invoice.py:564 +#: code:addons/account/account.py:3531 +#: code:addons/account/account_bank_statement.py:330 +#: code:addons/account/account_invoice.py:575 #, python-format msgid "Configuration Error!" msgstr "" @@ -2862,7 +2854,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:499 +#: code:addons/account/static/src/js/account_widgets.js:534 #, python-format msgid "Congrats, you're all done !" msgstr "" @@ -3275,7 +3267,7 @@ msgstr "" #. module: account #: selection:account.move.line,centralisation:0 -#: code:addons/account/account.py:1496 +#: code:addons/account/account.py:1509 #, python-format msgid "Currency Adjustment" msgstr "" @@ -3322,7 +3314,7 @@ msgstr "" #: view:account.config.settings:account.view_account_config_settings #: view:account.invoice:account.invoice_form #: view:account.invoice.report:account.view_account_invoice_report_search -#: code:addons/account/account_invoice.py:354 +#: code:addons/account/account_invoice.py:365 #, python-format msgid "Customer" msgstr "" @@ -3406,8 +3398,8 @@ msgstr "" #: selection:account.vat.declaration,filter:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:132 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:162 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:134 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:164 #: field:analytic.entries.report,date:0 #: view:website:account.report_analyticjournal #: view:website:account.report_generalledger @@ -3625,7 +3617,7 @@ msgstr "" #: field:account.tax.code,info:0 #: view:account.tax.code.template:account.view_tax_code_template_form #: field:account.tax.code.template,info:0 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:135 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:137 #: field:analytic.entries.report,name:0 #: field:report.invoice.created,name:0 #: view:website:account.report_invoice_document @@ -3805,7 +3797,7 @@ msgstr "" #. openerp-web #: field:account.invoice,date_due:0 #: field:account.invoice.report,date_due:0 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:163 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:165 #: field:report.invoice.created,date_due:0 #, python-format msgid "Due Date" @@ -3822,6 +3814,11 @@ msgstr "" msgid "Due Month" msgstr "" +#. module: account +#: model:ir.actions.report.xml,name:account.action_report_print_overdue +msgid "Due Payments" +msgstr "" + #. module: account #: field:account.move.line,date_maturity:0 msgid "Due date" @@ -3833,13 +3830,13 @@ msgid "Duration" msgstr "" #. module: account -#: code:addons/account/account.py:3184 +#: code:addons/account/account.py:3197 #, python-format msgid "ECNJ" msgstr "" #. module: account -#: code:addons/account/account.py:3182 +#: code:addons/account/account.py:3195 #, python-format msgid "EXJ" msgstr "" @@ -3856,7 +3853,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:503 +#: code:addons/account/static/src/js/account_widgets.js:538 #, python-format msgid "Efficiency at its finest" msgstr "" @@ -4020,7 +4017,7 @@ msgid "Entries Sorted by" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:965 +#: code:addons/account/account_move_line.py:964 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "" @@ -4032,7 +4029,7 @@ msgstr "" #. module: account #: code:addons/account/account_analytic_line.py:148 -#: code:addons/account/account_move_line.py:1070 +#: code:addons/account/account_move_line.py:1069 #, python-format msgid "Entries: " msgstr "" @@ -4043,7 +4040,7 @@ msgid "Entry" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:943 +#: code:addons/account/account_move_line.py:942 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "" @@ -4077,7 +4074,7 @@ msgid "Entry Subscription" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:967 +#: code:addons/account/account_move_line.py:966 #, python-format msgid "Entry is already reconciled." msgstr "" @@ -4094,8 +4091,8 @@ msgid "Equity" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:965 -#: code:addons/account/account_move_line.py:970 +#: code:addons/account/account_move_line.py:964 +#: code:addons/account/account_move_line.py:969 #, python-format msgid "Error" msgstr "" @@ -4109,38 +4106,38 @@ msgstr "" #: code:addons/account/account.py:1080 #: code:addons/account/account.py:1082 #: code:addons/account/account.py:1124 -#: code:addons/account/account.py:1294 -#: code:addons/account/account.py:1308 -#: code:addons/account/account.py:1332 -#: code:addons/account/account.py:1339 -#: code:addons/account/account.py:1537 -#: code:addons/account/account.py:1541 -#: code:addons/account/account.py:1628 -#: code:addons/account/account.py:2315 -#: code:addons/account/account.py:2629 -#: code:addons/account/account.py:3442 +#: code:addons/account/account.py:1307 +#: code:addons/account/account.py:1321 +#: code:addons/account/account.py:1345 +#: code:addons/account/account.py:1352 +#: code:addons/account/account.py:1550 +#: code:addons/account/account.py:1554 +#: code:addons/account/account.py:1641 +#: code:addons/account/account.py:2328 +#: code:addons/account/account.py:2642 +#: code:addons/account/account.py:3455 #: code:addons/account/account_analytic_line.py:95 #: code:addons/account/account_analytic_line.py:104 -#: code:addons/account/account_bank_statement.py:307 -#: code:addons/account/account_bank_statement.py:332 -#: code:addons/account/account_bank_statement.py:347 -#: code:addons/account/account_bank_statement.py:422 -#: code:addons/account/account_bank_statement.py:686 -#: code:addons/account/account_bank_statement.py:694 -#: code:addons/account/account_cash_statement.py:269 -#: code:addons/account/account_cash_statement.py:313 -#: code:addons/account/account_cash_statement.py:318 -#: code:addons/account/account_invoice.py:785 -#: code:addons/account/account_invoice.py:818 -#: code:addons/account/account_invoice.py:984 -#: code:addons/account/account_move_line.py:594 -#: code:addons/account/account_move_line.py:942 -#: code:addons/account/account_move_line.py:967 -#: code:addons/account/account_move_line.py:972 -#: code:addons/account/account_move_line.py:1221 -#: code:addons/account/account_move_line.py:1235 -#: code:addons/account/account_move_line.py:1237 -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_bank_statement.py:308 +#: code:addons/account/account_bank_statement.py:333 +#: code:addons/account/account_bank_statement.py:348 +#: code:addons/account/account_bank_statement.py:428 +#: code:addons/account/account_bank_statement.py:728 +#: code:addons/account/account_bank_statement.py:736 +#: code:addons/account/account_cash_statement.py:271 +#: code:addons/account/account_cash_statement.py:315 +#: code:addons/account/account_cash_statement.py:320 +#: code:addons/account/account_invoice.py:797 +#: code:addons/account/account_invoice.py:830 +#: code:addons/account/account_invoice.py:996 +#: code:addons/account/account_move_line.py:599 +#: code:addons/account/account_move_line.py:941 +#: code:addons/account/account_move_line.py:966 +#: code:addons/account/account_move_line.py:971 +#: code:addons/account/account_move_line.py:1220 +#: code:addons/account/account_move_line.py:1234 +#: code:addons/account/account_move_line.py:1236 +#: code:addons/account/account_move_line.py:1270 #: code:addons/account/report/common_report_header.py:92 #: code:addons/account/wizard/account_change_currency.py:38 #: code:addons/account/wizard/account_change_currency.py:59 @@ -4248,7 +4245,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:510 +#: code:addons/account/static/src/js/account_widgets.js:545 #, python-format msgid "Fast reconciler" msgstr "" @@ -4271,7 +4268,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:99 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:101 #, python-format msgid "Filter" msgstr "" @@ -4401,6 +4398,11 @@ msgstr "" msgid "Fiscal Position" msgstr "" +#. module: account +#: view:website:account.report_invoice_document +msgid "Fiscal Position Remark:" +msgstr "" + #. module: account #: view:account.fiscal.position.template:account.view_account_position_template_form #: view:account.fiscal.position.template:account.view_account_position_template_search @@ -4414,11 +4416,6 @@ msgstr "" msgid "Fiscal Position Templates" msgstr "" -#. module: account -#: view:website:account.report_invoice_document -msgid "Fiscal Position:" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form @@ -4592,7 +4589,7 @@ msgid "Foreign Balance" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:103 +#: code:addons/account/account_invoice.py:105 #, python-format msgid "Free Reference" msgstr "" @@ -4745,7 +4742,7 @@ msgid "Gives the type of the analytic journal. When it needs for a document (eg: msgstr "" #. module: account -#: code:addons/account/account_invoice.py:714 +#: code:addons/account/account_invoice.py:726 #, python-format msgid "Global taxes defined, but they are not in invoice lines !" msgstr "" @@ -4758,11 +4755,11 @@ msgstr "" #. module: account #: code:addons/account/account.py:947 #: code:addons/account/account.py:1040 -#: code:addons/account/account_invoice.py:443 -#: code:addons/account/account_invoice.py:537 -#: code:addons/account/account_invoice.py:556 -#: code:addons/account/account_invoice.py:581 -#: code:addons/account/account_move_line.py:547 +#: code:addons/account/account_invoice.py:454 +#: code:addons/account/account_invoice.py:548 +#: code:addons/account/account_invoice.py:567 +#: code:addons/account/account_invoice.py:592 +#: code:addons/account/account_move_line.py:552 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -4963,7 +4960,7 @@ msgid "Icon" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:422 +#: code:addons/account/account_bank_statement.py:428 #, python-format msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well." msgstr "" @@ -5098,6 +5095,12 @@ msgstr "" msgid "In dispute" msgstr "" +#. module: account +#: code:addons/account/wizard/account_fiscalyear_close_state.py:54 +#, python-format +msgid "In order to close a fiscalyear, you must first post related journal entries." +msgstr "" + #. module: account #: code:addons/account/wizard/account_period_close.py:52 #, python-format @@ -5105,13 +5108,13 @@ msgid "In order to close a period, you must first post related journal entries." msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:430 +#: code:addons/account/account_bank_statement.py:436 #, python-format msgid "In order to delete a bank statement line, you must first cancel it to delete related journal items." msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:390 +#: code:addons/account/account_bank_statement.py:392 #, python-format msgid "In order to delete a bank statement, you must first cancel it to delete related journal items." msgstr "" @@ -5194,14 +5197,14 @@ msgid "Installs localized accounting charts to match as closely as possible the msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:644 -#: code:addons/account/account_bank_statement.py:648 +#: code:addons/account/account_bank_statement.py:686 +#: code:addons/account/account_bank_statement.py:690 #, python-format msgid "Insufficient Configuration!" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:501 +#: code:addons/account/account_invoice.py:512 #: code:addons/account/wizard/account_invoice_refund.py:153 #, python-format msgid "Insufficient Data!" @@ -5259,8 +5262,9 @@ msgid "IntraCom" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:389 -#: code:addons/account/account_bank_statement.py:429 +#: code:addons/account/account_bank_statement.py:391 +#: code:addons/account/account_bank_statement.py:435 +#: code:addons/account/wizard/account_fiscalyear_close_state.py:54 #: code:addons/account/wizard/account_period_close.py:52 #, python-format msgid "Invalid Action!" @@ -5284,7 +5288,7 @@ msgstr "" #: view:account.invoice:account.view_account_invoice_filter #: view:account.invoice.report:account.view_account_invoice_report_search #: field:account.move.line,invoice:0 -#: code:addons/account/account_invoice.py:1008 +#: code:addons/account/account_invoice.py:1020 #: model:ir.model,name:account.model_account_invoice #: model:res.request.link,name:account.req_link_invoice #: view:website:account.report_invoice_document @@ -5377,7 +5381,7 @@ msgid "Invoice is already reconciled." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:565 +#: code:addons/account/account_invoice.py:576 #, python-format msgid "Invoice line account's company and invoice's company does not match." msgstr "" @@ -5393,13 +5397,13 @@ msgid "Invoice paid" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1183 +#: code:addons/account/account_invoice.py:1195 #, python-format msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1622 +#: code:addons/account/account_invoice.py:1642 #, python-format msgid "Invoice sent" msgstr "" @@ -5507,7 +5511,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:42 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:43 #, python-format msgid "It took you" msgstr "" @@ -5562,7 +5566,7 @@ msgstr "" #: field:account.move.bank.reconcile,journal_id:0 #: view:account.move.line:account.view_account_move_line_filter #: field:account.move.line,journal_id:0 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:160 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:162 #: view:analytic.entries.report:account.view_analytic_entries_report_search #: field:analytic.entries.report,journal_id:0 #: model:ir.actions.report.xml,name:account.action_report_account_journal @@ -5662,13 +5666,13 @@ msgid "Journal Item" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:893 +#: code:addons/account/account_move_line.py:892 #, python-format msgid "Journal Item '%s' (id: %s) cannot be used in a reconciliation as it is not balanced!" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:889 +#: code:addons/account/account_move_line.py:888 #, python-format msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!" msgstr "" @@ -5677,7 +5681,7 @@ msgstr "" #: view:account.bank.statement:account.view_bank_statement_form #: view:account.move:account.view_move_form #: view:account.move.line:account.view_move_line_tree -#: code:addons/account/account_bank_statement.py:398 +#: code:addons/account/account_bank_statement.py:404 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line #: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open #: model:ir.actions.act_window,name:account.action_account_items @@ -5840,8 +5844,8 @@ msgstr "" #. module: account #. openerp-web #: field:account.statement.operation.template,label:0 -#: code:addons/account/static/src/js/account_widgets.js:72 -#: code:addons/account/static/src/js/account_widgets.js:77 +#: code:addons/account/static/src/js/account_widgets.js:75 +#: code:addons/account/static/src/js/account_widgets.js:80 #: view:website:account.report_journal #: view:website:account.report_salepurchasejournal #, python-format @@ -6128,8 +6132,8 @@ msgid "List of all the taxes that have to be installed by the wizard" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:304 -#: code:addons/account/account_cash_statement.py:311 +#: code:addons/account/account_cash_statement.py:306 +#: code:addons/account/account_cash_statement.py:313 #, python-format msgid "Loss" msgstr "" @@ -6146,7 +6150,7 @@ msgid "Loss Exchange Rate Account" msgstr "" #. module: account -#: code:addons/account/account.py:3185 +#: code:addons/account/account.py:3198 #, python-format msgid "MISC" msgstr "" @@ -6232,7 +6236,7 @@ msgid "Maturity date of entry line generated by model line '%s' is based on part msgstr "" #. module: account -#: code:addons/account/account.py:2315 +#: code:addons/account/account.py:2328 #, python-format msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n" "Please define partner on it!" @@ -6278,7 +6282,7 @@ msgid "Miscellaneous" msgstr "" #. module: account -#: code:addons/account/account.py:3177 +#: code:addons/account/account.py:3190 #, python-format msgid "Miscellaneous Journal" msgstr "" @@ -6360,7 +6364,7 @@ msgid "Move bank reconcile" msgstr "" #. module: account -#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1420 #, python-format msgid "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)" msgstr "" @@ -6371,7 +6375,7 @@ msgid "Move line reconcile select" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1233 +#: code:addons/account/account_move_line.py:1232 #, python-format msgid "Move name (id): %s (%s)" msgstr "" @@ -6413,8 +6417,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:1745 -#: code:addons/account/static/src/js/account_widgets.js:1751 +#: code:addons/account/static/src/js/account_widgets.js:1789 +#: code:addons/account/static/src/js/account_widgets.js:1795 #, python-format msgid "Never" msgstr "" @@ -6422,7 +6426,7 @@ msgstr "" #. module: account #. openerp-web #: selection:account.bank.statement,state:0 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:111 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:113 #, python-format msgid "New" msgstr "" @@ -6475,10 +6479,10 @@ msgid "Next supplier invoice number" msgstr "" #. module: account -#: code:addons/account/account.py:2303 -#: code:addons/account/account_invoice.py:92 -#: code:addons/account/account_invoice.py:662 -#: code:addons/account/account_move_line.py:192 +#: code:addons/account/account.py:2316 +#: code:addons/account/account_invoice.py:94 +#: code:addons/account/account_invoice.py:673 +#: code:addons/account/account_move_line.py:194 #, python-format msgid "No Analytic Journal!" msgstr "" @@ -6513,19 +6517,19 @@ msgid "No Follow-up" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:787 +#: code:addons/account/account_invoice.py:799 #, python-format msgid "No Invoice Lines!" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1299 +#: code:addons/account/account_invoice.py:1311 #, python-format msgid "No Partner Defined!" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1300 +#: code:addons/account/account_move_line.py:1299 #, python-format msgid "No Piece Number!" msgstr "" @@ -6548,14 +6552,14 @@ msgid "No period found on the invoice." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1270 #, python-format msgid "No period found or more than one period found for the given date." msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:120 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:122 #, python-format msgid "No result matching '" msgstr "" @@ -6696,7 +6700,7 @@ msgid "OK" msgstr "" #. module: account -#: code:addons/account/account.py:3186 +#: code:addons/account/account.py:3199 #, python-format msgid "OPEJ" msgstr "" @@ -6726,15 +6730,15 @@ msgid "Only One Chart Template Available" msgstr "" #. module: account -#: code:addons/account/account.py:3379 -#: code:addons/account/res_config.py:310 +#: code:addons/account/account.py:3392 +#: code:addons/account/res_config.py:305 #, python-format msgid "Only administrators can change the settings" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:504 +#: code:addons/account/static/src/js/account_widgets.js:539 #, python-format msgid "Only use the ctrl-enter shortcut to validate reconciliations." msgstr "" @@ -6782,8 +6786,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:1628 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:193 +#: code:addons/account/static/src/js/account_widgets.js:1669 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:195 #, python-format msgid "Open balance" msgstr "" @@ -6834,7 +6838,7 @@ msgstr "" #. module: account #: field:account.fiscalyear.close,journal_id:0 -#: code:addons/account/account.py:3178 +#: code:addons/account/account.py:3191 #, python-format msgid "Opening Entries Journal" msgstr "" @@ -6850,7 +6854,7 @@ msgid "Opening Entries Reconciliation" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1139 +#: code:addons/account/account_move_line.py:1138 #, python-format msgid "Opening Entries have already been generated. Please run \"Cancel Closing Entries\" wizard to cancel those entries and then run this wizard." msgstr "" @@ -6920,7 +6924,6 @@ msgid "Outgoing Currencies Rate" msgstr "" #. module: account -#: model:ir.actions.report.xml,name:account.action_report_print_overdue #: view:res.company:account.view_company_inherit_form msgid "Overdue Payments" msgstr "" @@ -7040,8 +7043,8 @@ msgstr "" #: field:account.move,partner_id:0 #: view:account.move.line:account.view_account_move_line_filter #: field:account.move.line,partner_id:0 -#: code:addons/account/static/src/js/account_widgets.js:864 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:133 +#: code:addons/account/static/src/js/account_widgets.js:913 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:135 #: view:analytic.entries.report:account.view_analytic_entries_report_search #: field:analytic.entries.report,partner_id:0 #: model:ir.model,name:account.model_res_partner @@ -7154,8 +7157,8 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 -#: code:addons/account/report/account_partner_balance.py:300 -#: code:addons/account/report/account_partner_ledger.py:275 +#: code:addons/account/report/account_partner_balance.py:253 +#: code:addons/account/report/account_partner_ledger.py:276 #: view:website:account.report_agedpartnerbalance #, python-format msgid "Payable Accounts" @@ -7308,7 +7311,7 @@ msgstr "" #: field:account.subscription,period_nbr:0 #: field:account.tax.chart,period_id:0 #: field:account.treasury.report,period_id:0 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:161 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:163 #: field:validate.account.move,period_ids:0 #, python-format msgid "Period" @@ -7415,31 +7418,31 @@ msgid "Please check that the field 'Journal' is set on the Bank Statement" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:787 +#: code:addons/account/account_invoice.py:799 #, python-format msgid "Please create some invoice lines." msgstr "" #. module: account -#: code:addons/account/account.py:1308 +#: code:addons/account/account.py:1321 #, python-format msgid "Please define a sequence on the journal." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:785 +#: code:addons/account/account_invoice.py:797 #, python-format msgid "Please define sequence on the journal related to this invoice." msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:329 +#: code:addons/account/account_bank_statement.py:330 #, python-format msgid "Please verify that an account is defined in the journal." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:807 +#: code:addons/account/account_invoice.py:819 #, python-format msgid "Please verify the price of the invoice!\n" "The encoded total does not match the computed total." @@ -7613,8 +7616,8 @@ msgid "Products Quantity" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:304 -#: code:addons/account/account_cash_statement.py:316 +#: code:addons/account/account_cash_statement.py:306 +#: code:addons/account/account_cash_statement.py:318 #, python-format msgid "Profit" msgstr "" @@ -7699,7 +7702,7 @@ msgid "Purchase" msgstr "" #. module: account -#: code:addons/account/account.py:3174 +#: code:addons/account/account.py:3187 #, python-format msgid "Purchase Journal" msgstr "" @@ -7710,7 +7713,7 @@ msgid "Purchase Refund" msgstr "" #. module: account -#: code:addons/account/account.py:3176 +#: code:addons/account/account.py:3189 #, python-format msgid "Purchase Refund Journal" msgstr "" @@ -7721,7 +7724,7 @@ msgid "Purchase Tax" msgstr "" #. module: account -#: code:addons/account/account.py:3369 +#: code:addons/account/account.py:3382 #, python-format msgid "Purchase Tax %.2f%%" msgstr "" @@ -7834,8 +7837,8 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 -#: code:addons/account/report/account_partner_balance.py:298 -#: code:addons/account/report/account_partner_ledger.py:273 +#: code:addons/account/report/account_partner_balance.py:251 +#: code:addons/account/report/account_partner_ledger.py:274 #: view:website:account.report_agedpartnerbalance #, python-format msgid "Receivable Accounts" @@ -7851,8 +7854,8 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 -#: code:addons/account/report/account_partner_balance.py:302 -#: code:addons/account/report/account_partner_ledger.py:277 +#: code:addons/account/report/account_partner_balance.py:255 +#: code:addons/account/report/account_partner_ledger.py:278 #: view:website:account.report_agedpartnerbalance #, python-format msgid "Receivable and Payable Accounts" @@ -7935,7 +7938,7 @@ msgstr "" #: view:account.move.line:account.view_move_line_form #: view:account.move.line.reconcile:account.view_account_move_line_reconcile_full #: view:account.move.line.reconcile.select:account.view_account_move_line_reconcile_select -#: code:addons/account/static/src/js/account_widgets.js:26 +#: code:addons/account/static/src/js/account_widgets.js:28 #: code:addons/account/wizard/account_move_line_reconcile_select.py:45 #: model:ir.ui.menu,name:account.periodical_processing_reconciliation #, python-format @@ -8035,11 +8038,16 @@ msgstr "" msgid "Reference/Description" msgstr "" +#. module: account +#: view:website:account.report_invoice_document +msgid "Reference:" +msgstr "" + #. module: account #: view:account.invoice:account.invoice_form #: view:account.invoice:account.invoice_supplier_form #: view:account.invoice.report:account.view_account_invoice_report_search -#: code:addons/account/account_invoice.py:1010 +#: code:addons/account/account_invoice.py:1022 #: view:website:account.report_invoice_document #, python-format msgid "Refund" @@ -8193,7 +8201,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:169 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:171 #: field:report.invoice.created,residual:0 #, python-format msgid "Residual" @@ -8275,13 +8283,13 @@ msgid "Running Subscriptions" msgstr "" #. module: account -#: code:addons/account/account.py:3181 +#: code:addons/account/account.py:3194 #, python-format msgid "SAJ" msgstr "" #. module: account -#: code:addons/account/account.py:3183 +#: code:addons/account/account.py:3196 #, python-format msgid "SCNJ" msgstr "" @@ -8336,13 +8344,13 @@ msgid "Sales" msgstr "" #. module: account -#: code:addons/account/account.py:3173 +#: code:addons/account/account.py:3186 #, python-format msgid "Sales Journal" msgstr "" #. module: account -#: code:addons/account/account.py:3175 +#: code:addons/account/account.py:3188 #, python-format msgid "Sales Refund Journal" msgstr "" @@ -8352,11 +8360,6 @@ msgstr "" msgid "Sales Tax(%)" msgstr "" -#. module: account -#: view:account.invoice.report:account.view_account_invoice_report_search -msgid "Sales Team" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all #: view:report.account.sales:account.view_report_account_sales_graph @@ -8500,7 +8503,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:926 +#: code:addons/account/static/src/js/account_widgets.js:975 #, python-format msgid "Select Partner" msgstr "" @@ -8689,6 +8692,13 @@ msgstr "" msgid "Shortcut" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:35 +#, python-format +msgid "Show more... (" +msgstr "" + #. module: account #: help:account.partner.reconcile.process,progress:0 msgid "Shows you the progress made today on the reconciliation process. Given by \n" @@ -8716,7 +8726,7 @@ msgid "Smallest Text" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:972 +#: code:addons/account/account_move_line.py:971 #, python-format msgid "Some entries are already reconciled." msgstr "" @@ -8871,7 +8881,7 @@ msgid "Statement" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:351 +#: code:addons/account/account_bank_statement.py:352 #, python-format msgid "Statement %s confirmed, journal items were created." msgstr "" @@ -8978,7 +8988,7 @@ msgstr "" #: view:account.config.settings:account.view_account_config_settings #: view:account.invoice:account.invoice_supplier_form #: view:account.invoice.report:account.view_account_invoice_report_search -#: code:addons/account/account_invoice.py:356 +#: code:addons/account/account_invoice.py:367 #, python-format msgid "Supplier" msgstr "" @@ -8987,7 +8997,7 @@ msgstr "" #: view:account.invoice:account.invoice_supplier_form #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/account_invoice.py:1009 +#: code:addons/account/account_invoice.py:1021 #: selection:report.invoice.created,type:0 #: view:website:account.report_invoice_document #, python-format @@ -9013,7 +9023,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/account_invoice.py:1011 +#: code:addons/account/account_invoice.py:1023 #: selection:report.invoice.created,type:0 #: view:website:account.report_invoice_document #, python-format @@ -9055,7 +9065,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:511 +#: code:addons/account/static/src/js/account_widgets.js:546 #, python-format msgid "Take on average less than 5 seconds to reconcile a transaction." msgstr "" @@ -9107,8 +9117,8 @@ msgstr "" #: field:account.move.line,account_tax_id:0 #: field:account.statement.operation.template,tax_id:0 #: view:account.tax:account.view_account_tax_search -#: code:addons/account/static/src/js/account_widgets.js:85 -#: code:addons/account/static/src/js/account_widgets.js:91 +#: code:addons/account/static/src/js/account_widgets.js:88 +#: code:addons/account/static/src/js/account_widgets.js:94 #: model:ir.model,name:account.model_account_tax #: view:website:account.report_invoice_document #: view:website:account.report_salepurchasejournal @@ -9117,7 +9127,7 @@ msgid "Tax" msgstr "" #. module: account -#: code:addons/account/account.py:3366 +#: code:addons/account/account.py:3379 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -9278,7 +9288,7 @@ msgid "Tax Use In" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:717 +#: code:addons/account/account_invoice.py:729 #, python-format msgid "Tax base different!\n" "Click on compute to update the tax base." @@ -9339,7 +9349,7 @@ msgid "Taxes Report" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:720 +#: code:addons/account/account_invoice.py:732 #, python-format msgid "Taxes are missing!\n" "Click on compute button." @@ -9403,7 +9413,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:42 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:43 #, python-format msgid "That's on average" msgstr "" @@ -9424,19 +9434,19 @@ msgid "The account basis of the tax declaration." msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:332 +#: code:addons/account/account_bank_statement.py:333 #, python-format msgid "The account entries lines are not in valid state." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:970 +#: code:addons/account/account_move_line.py:969 #, python-format msgid "The account is not defined to be reconciled !" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1116 +#: code:addons/account/account_move_line.py:1115 #, python-format msgid "The account move (%s) for centralisation has been confirmed." msgstr "" @@ -9468,7 +9478,7 @@ msgid "The amount will count as a debit if it is negative, as a credit if it is msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:686 +#: code:addons/account/account_bank_statement.py:728 #, python-format msgid "The bank statement line was already reconciled." msgstr "" @@ -9616,7 +9626,7 @@ msgid "The partner reference of this invoice." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:502 +#: code:addons/account/account_invoice.py:513 #, python-format msgid "The payment term of supplier does not have a payment term line." msgstr "" @@ -9653,7 +9663,7 @@ msgid "The selected account of your Journal Entry forces to provide a secondary msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1379 +#: code:addons/account/account_invoice.py:1391 #, python-format msgid "The selected unit of measure is not compatible with the unit of measure of the product." msgstr "" @@ -9674,7 +9684,7 @@ msgid "The sequence field is used to order the taxes lines from lower sequences msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:308 +#: code:addons/account/account_bank_statement.py:309 #, python-format msgid "The statement balance is incorrect !\n" "The expected balance (%.2f) is different than the computed one. (%.2f)" @@ -9702,26 +9712,26 @@ msgid "There is currently no company without chart of account. The wizard will t msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:313 +#: code:addons/account/account_cash_statement.py:315 #, python-format msgid "There is no Loss Account on the journal %s." msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:318 +#: code:addons/account/account_cash_statement.py:320 #, python-format msgid "There is no Profit Account on the journal %s." msgstr "" #. module: account -#: code:addons/account/account.py:1443 +#: code:addons/account/account.py:1456 #, python-format msgid "There is no default credit account defined \n" "on journal \"%s\"." msgstr "" #. module: account -#: code:addons/account/account.py:1436 +#: code:addons/account/account.py:1449 #, python-format msgid "There is no default debit account defined \n" "on journal \"%s\"." @@ -9746,7 +9756,7 @@ msgid "There is no opening/closing period defined, please create one to set the msgstr "" #. module: account -#: code:addons/account/account.py:2629 +#: code:addons/account/account.py:2642 #, python-format msgid "There is no parent code for the template account." msgstr "" @@ -10049,7 +10059,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:35 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:36 #, python-format msgid "Tip : Hit ctrl-enter to validate the whole sheet." msgstr "" @@ -10087,8 +10097,8 @@ msgid "To Review" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:880 -#: code:addons/account/account_move_line.py:938 +#: code:addons/account/account_move_line.py:879 +#: code:addons/account/account_move_line.py:937 #, python-format msgid "To reconcile the entries company should be the same for all entries." msgstr "" @@ -10098,7 +10108,7 @@ msgstr "" #: view:account.analytic.line:account.view_account_analytic_line_tree #: view:account.bank.statement:account.view_bank_statement_form2 #: field:account.invoice,amount_total:0 -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:165 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:167 #: field:report.account.sales,amount_total:0 #: field:report.account_type.sales,amount_total:0 #: field:report.invoice.created,amount_total:0 @@ -10236,7 +10246,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:134 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:136 #, python-format msgid "Transaction" msgstr "" @@ -10305,7 +10315,7 @@ msgid "Unable to adapt the initial balance (negative value)." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1172 +#: code:addons/account/account_move_line.py:1171 #, python-format msgid "Unable to change tax!" msgstr "" @@ -10356,7 +10366,7 @@ msgid "Unit of Measure" msgstr "" #. module: account -#: code:addons/account/report/account_partner_balance.py:116 +#: code:addons/account/report/account_partner_balance.py:125 #, python-format msgid "Unknown Partner" msgstr "" @@ -10518,12 +10528,12 @@ msgid "User" msgstr "" #. module: account -#: code:addons/account/account.py:1401 -#: code:addons/account/account.py:1406 -#: code:addons/account/account.py:1435 -#: code:addons/account/account.py:1442 -#: code:addons/account/account_invoice.py:881 -#: code:addons/account/account_move_line.py:1115 +#: code:addons/account/account.py:1414 +#: code:addons/account/account.py:1419 +#: code:addons/account/account.py:1448 +#: code:addons/account/account.py:1455 +#: code:addons/account/account_invoice.py:893 +#: code:addons/account/account_move_line.py:1114 #: code:addons/account/wizard/account_automatic_reconcile.py:154 #: code:addons/account/wizard/account_fiscalyear_close.py:89 #: code:addons/account/wizard/account_fiscalyear_close.py:100 @@ -10612,10 +10622,10 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/account_move_line.py:889 -#: code:addons/account/account_move_line.py:893 -#: code:addons/account/static/src/js/account_widgets.js:1009 -#: code:addons/account/static/src/js/account_widgets.js:1761 +#: code:addons/account/account_move_line.py:888 +#: code:addons/account/account_move_line.py:892 +#: code:addons/account/static/src/js/account_widgets.js:1058 +#: code:addons/account/static/src/js/account_widgets.js:1805 #, python-format msgid "Warning" msgstr "" @@ -10634,15 +10644,15 @@ msgstr "" #: code:addons/account/account.py:799 #: code:addons/account/account.py:1047 #: code:addons/account/account.py:1067 -#: code:addons/account/account_invoice.py:714 -#: code:addons/account/account_invoice.py:717 -#: code:addons/account/account_invoice.py:720 -#: code:addons/account/account_invoice.py:1378 +#: code:addons/account/account_invoice.py:726 +#: code:addons/account/account_invoice.py:729 +#: code:addons/account/account_invoice.py:732 +#: code:addons/account/account_invoice.py:1390 #: code:addons/account/account_move_line.py:95 -#: code:addons/account/account_move_line.py:880 -#: code:addons/account/account_move_line.py:938 -#: code:addons/account/account_move_line.py:977 -#: code:addons/account/account_move_line.py:1138 +#: code:addons/account/account_move_line.py:879 +#: code:addons/account/account_move_line.py:937 +#: code:addons/account/account_move_line.py:976 +#: code:addons/account/account_move_line.py:1137 #: code:addons/account/wizard/account_fiscalyear_close.py:62 #: code:addons/account/wizard/account_invoice_state.py:41 #: code:addons/account/wizard/account_invoice_state.py:64 @@ -10676,7 +10686,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:498 +#: code:addons/account/static/src/js/account_widgets.js:533 #, python-format msgid "Whew, that was fast !" msgstr "" @@ -10727,7 +10737,7 @@ msgstr "" #. module: account #: view:account.move.line.reconcile:account.view_account_move_line_reconcile_full -#: code:addons/account/account_move_line.py:992 +#: code:addons/account/account_move_line.py:991 #, python-format msgid "Write-Off" msgstr "" @@ -10754,7 +10764,13 @@ msgid "Write-Off amount" msgstr "" #. module: account -#: code:addons/account/account.py:2291 +#: code:addons/account/wizard/account_reconcile.py:115 +#, python-format +msgid "Write-off" +msgstr "" + +#. module: account +#: code:addons/account/account.py:2304 #, python-format msgid "Wrong Model!" msgstr "" @@ -10789,7 +10805,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:1011 +#: code:addons/account/static/src/js/account_widgets.js:1060 #, python-format msgid "You are selecting transactions from both a payable and a receivable account.\n" "\n" @@ -10802,7 +10818,7 @@ msgid "You can check this box to mark this journal item as a litigation with the msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1221 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not add/modify entries in a closed period %s of journal %s." msgstr "" @@ -10813,6 +10829,11 @@ msgstr "" msgid "You can not re-open a period which belongs to closed fiscal year" msgstr "" +#. module: account +#: constraint:account.fiscal.position:0 +msgid "You can not select a country and a group of countries" +msgstr "" + #. module: account #: code:addons/account/wizard/account_change_currency.py:38 #, python-format @@ -10840,7 +10861,7 @@ msgid "You can specify here the coefficient that will be used when consolidating msgstr "" #. module: account -#: code:addons/account/account.py:2260 +#: code:addons/account/account.py:2273 #, python-format msgid "You can specify year, month and date in the name of the model using the following labels:\n" "\n" @@ -10852,7 +10873,7 @@ msgid "You can specify year, month and date in the name of the model using the f msgstr "" #. module: account -#: code:addons/account/account_invoice.py:984 +#: code:addons/account/account_invoice.py:996 #, python-format msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." msgstr "" @@ -10870,7 +10891,7 @@ msgid "You cannot change the owner company of an account that already contains j msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1172 +#: code:addons/account/account_move_line.py:1171 #, python-format msgid "You cannot change the tax, you should remove and recreate lines." msgstr "" @@ -10888,13 +10909,13 @@ msgid "You cannot change the type of account to '%s' type as it contains journal msgstr "" #. module: account -#: code:addons/account/account_invoice.py:882 +#: code:addons/account/account_invoice.py:894 #, python-format msgid "You cannot create an invoice on a centralized journal. Uncheck the centralized counterpart box in the related journal from the configuration menu." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:594 +#: code:addons/account/account_move_line.py:599 #, python-format msgid "You cannot create journal items on a closed account %s %s." msgstr "" @@ -10926,39 +10947,39 @@ msgid "You cannot deactivate an account that contains journal items." msgstr "" #. module: account -#: code:addons/account/account.py:1402 +#: code:addons/account/account.py:1415 #, python-format msgid "You cannot delete a posted journal entry \"%s\"." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:412 +#: code:addons/account/account_invoice.py:423 #, python-format msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:410 +#: code:addons/account/account_invoice.py:421 #, python-format msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1235 +#: code:addons/account/account_move_line.py:1234 #, python-format msgid "You cannot do this modification on a confirmed entry. You can just change some non legal fields or you must unconfirm the journal entry first.\n" "%s." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1237 +#: code:addons/account/account_move_line.py:1236 #, 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." msgstr "" #. module: account -#: code:addons/account/account.py:1339 +#: code:addons/account/account.py:1352 #, python-format msgid "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." @@ -10988,26 +11009,26 @@ msgid "You cannot remove/deactivate an account which is set on a customer or sup msgstr "" #. module: account -#: code:addons/account/account.py:1628 +#: code:addons/account/account.py:1641 #, python-format msgid "You cannot unreconcile journal items if they has been generated by the opening/closing fiscal year process." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1174 -#: code:addons/account/account_move_line.py:1258 +#: code:addons/account/account_move_line.py:1173 +#: code:addons/account/account_move_line.py:1257 #, python-format msgid "You cannot use an inactive account." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1325 +#: code:addons/account/account_move_line.py:1324 #, python-format msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal." msgstr "" #. module: account -#: code:addons/account/account.py:1294 +#: code:addons/account/account.py:1307 #, python-format msgid "You cannot validate a non-balanced entry.\n" "Make sure you have configured payment terms properly.\n" @@ -11015,19 +11036,19 @@ msgid "You cannot validate a non-balanced entry.\n" msgstr "" #. module: account -#: code:addons/account/account.py:1333 +#: code:addons/account/account.py:1346 #, python-format msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"." msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:269 +#: code:addons/account/account_cash_statement.py:271 #, python-format msgid "You do not have rights to open this %s journal!" msgstr "" #. module: account -#: code:addons/account/account.py:2291 +#: code:addons/account/account.py:2304 #, python-format msgid "You have a wrong expression \"%(...)s\" in your model!" msgstr "" @@ -11039,9 +11060,9 @@ msgid "You have not supplied enough arguments to compute the initial balance, pl msgstr "" #. module: account -#: code:addons/account/account.py:2303 -#: code:addons/account/account_invoice.py:663 -#: code:addons/account/account_move_line.py:192 +#: code:addons/account/account.py:2316 +#: code:addons/account/account_invoice.py:674 +#: code:addons/account/account_move_line.py:194 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" msgstr "" @@ -11054,13 +11075,13 @@ msgid "You have to define the bank account\n" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:977 +#: code:addons/account/account_move_line.py:976 #, python-format msgid "You have to provide an account for the write off/exchange difference entry." msgstr "" #. module: account -#: code:addons/account/account.py:3518 +#: code:addons/account/account.py:3531 #, python-format msgid "You have to set a code for the bank account defined on the selected chart of accounts." msgstr "" @@ -11073,19 +11094,26 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_widgets.js:1763 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:68 +#, python-format +msgid "You must balance the reconciliation" +msgstr "" + +#. module: account +#. openerp-web +#: code:addons/account/static/src/js/account_widgets.js:1807 #, python-format msgid "You must choose at least one record." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:93 +#: code:addons/account/account_invoice.py:95 #, python-format msgid "You must define an analytic journal of type '%s'!" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1299 +#: code:addons/account/account_invoice.py:1311 #, python-format msgid "You must first select a partner!" msgstr "" @@ -11121,13 +11149,13 @@ msgid "You should choose the periods that belong to the same company." msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:648 +#: code:addons/account/account_bank_statement.py:690 #, 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/account_bank_statement.py:644 +#: code:addons/account/account_bank_statement.py:686 #, 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 "" @@ -11141,7 +11169,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:44 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:45 #, python-format msgid "You validated" msgstr "" @@ -11165,7 +11193,7 @@ msgid "balance" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:651 +#: code:addons/account/account_bank_statement.py:693 #, python-format msgid "change" msgstr "" @@ -11205,6 +11233,48 @@ msgstr "" msgid "month" msgstr "" +#. module: account +#: view:account.aged.trial.balance:account.account_aged_balance_view +#: view:account.analytic.balance:account.account_analytic_balance_view +#: view:account.analytic.chart:account.account_analytic_chart_view +#: view:account.analytic.cost.ledger:account.account_analytic_cost_view +#: view:account.analytic.cost.ledger.journal.report:account.account_analytic_cost_ledger_journal_view +#: view:account.analytic.inverted.balance:account.account_analytic_invert_balance_view +#: view:account.analytic.journal.report:account.account_analytic_journal_view +#: view:account.automatic.reconcile:account.account_automatic_reconcile_view +#: view:account.change.currency:account.view_account_change_currency +#: view:account.chart:account.view_account_chart +#: view:account.common.report:account.account_common_report_view +#: view:account.config.settings:account.view_account_config_settings +#: view:account.fiscalyear.close:account.view_account_fiscalyear_close +#: view:account.fiscalyear.close.state:account.view_account_fiscalyear_close_state +#: view:account.invoice.cancel:account.account_invoice_cancel_view +#: view:account.invoice.confirm:account.account_invoice_confirm_view +#: view:account.invoice.refund:account.view_account_invoice_refund +#: view:account.journal.select:account.open_journal_button_view +#: view:account.move.bank.reconcile:account.view_account_move_bank_reconcile +#: view:account.move.line.reconcile:account.view_account_move_line_reconcile_full +#: view:account.move.line.reconcile.select:account.view_account_move_line_reconcile_select +#: view:account.move.line.reconcile.writeoff:account.account_move_line_reconcile_writeoff +#: view:account.move.line.unreconcile.select:account.view_account_move_line_unreconcile_select +#: view:account.open.closed.fiscalyear:account.view_account_open_closed_fiscalyear +#: view:account.period.close:account.view_account_period_close +#: view:account.state.open:account.view_account_state_open +#: view:account.statement.from.invoice.lines:account.view_account_statement_from_invoice_lines +#: view:account.subscription.generate:account.view_account_subscription_generate +#: view:account.tax.chart:account.view_account_tax_chart +#: view:account.unreconcile:account.account_unreconcile_view +#: view:account.use.model:account.view_account_use_model +#: view:account.use.model:account.view_account_use_model_create_entry +#: view:account.vat.declaration:account.view_account_vat_declaration +#: view:cash.box.in:account.cash_box_in_form +#: view:cash.box.out:account.cash_box_out_form +#: view:project.account.analytic.line:account.view_project_account_analytic_line_form +#: view:validate.account.move:account.validate_account_move_view +#: view:validate.account.move.lines:account.validate_account_move_line_view +msgid "or" +msgstr "" + #. module: account #: model:ir.model,name:account.model_account_period_close msgid "period close" @@ -11212,11 +11282,18 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:44 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:45 #, python-format msgid "reconciliations with the ctrl-enter shortcut." msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:35 +#, python-format +msgid "remaining)" +msgstr "" + #. module: account #: view:wizard.multi.charts.accounts:account.view_wizard_multi_chart msgid "res_config_contents" @@ -11224,7 +11301,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:42 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:43 #, python-format msgid "seconds per transaction." msgstr "" @@ -11241,14 +11318,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:42 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:43 #, python-format msgid "to reconcile" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:42 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:43 #, python-format msgid "transactions." msgstr "" diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot index c12b3b511ed..5975d560545 100644 --- a/addons/account_accountant/i18n/account_accountant.pot +++ b/addons/account_accountant/i18n/account_accountant.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot index 29f1c8e32c7..ccc5c1983c3 100644 --- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot +++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -341,7 +341,7 @@ msgid "End date passed or prepaid unit consumed" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:674 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:681 #, python-format msgid "Error!" msgstr "" @@ -490,7 +490,7 @@ msgid "Month(s)" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:669 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:676 #, python-format msgid "No Customer Defined!" msgstr "" @@ -546,7 +546,7 @@ msgid "Pending contracts" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:675 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:682 #, python-format msgid "Please define a sale journal for the company \"%s\"." msgstr "" @@ -620,7 +620,7 @@ msgid "Revenue per Time (real)" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:543 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:550 #, python-format msgid "Sales Order Lines to Invoice of %s" msgstr "" @@ -683,7 +683,7 @@ msgid "Timesheets" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:652 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:659 #, python-format msgid "Timesheets to Invoice of %s" msgstr "" @@ -804,7 +804,7 @@ msgid "Year(s)" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:669 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:676 #, python-format msgid "You must first select a Customer for Contract %s!" msgstr "" diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot index f51e1c0df84..8830c6642b7 100644 --- a/addons/account_analytic_default/i18n/account_analytic_default.pot +++ b/addons/account_analytic_default/i18n/account_analytic_default.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot index c48b55c5222..d1ba5cf982c 100644 --- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot +++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -339,7 +339,7 @@ msgstr "" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:335 -#: code:addons/account_analytic_plans/account_analytic_plans.py:469 +#: code:addons/account_analytic_plans/account_analytic_plans.py:471 #, python-format msgid "No Analytic Journal!" msgstr "" @@ -456,7 +456,7 @@ msgstr "" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:335 -#: code:addons/account_analytic_plans/account_analytic_plans.py:469 +#: code:addons/account_analytic_plans/account_analytic_plans.py:471 #, python-format msgid "You have to define an analytic journal on the '%s' journal." msgstr "" @@ -466,3 +466,9 @@ msgstr "" msgid "analytic.plan.create.model.action" msgstr "" +#. module: account_analytic_plans +#: view:account.crossovered.analytic:account_analytic_plans.view_account_crossovered_analytic +#: view:analytic.plan.create.model:account_analytic_plans.view_analytic_plan_create_model_msg +msgid "or" +msgstr "" + diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot index 7ee13e4ffaf..20321c0e560 100644 --- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot +++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -61,6 +61,11 @@ msgstr "" msgid "Purchase Order" msgstr "" +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_stock_move +msgid "Stock Move" +msgstr "" + #. module: account_anglo_saxon #: help:product.category,property_account_creditor_price_difference_categ:0 #: help:product.template,property_account_creditor_price_difference:0 diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot index fedf88b0b93..8b7e9405ed5 100644 --- a/addons/account_asset/i18n/account_asset.pot +++ b/addons/account_asset/i18n/account_asset.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -117,6 +117,11 @@ msgstr "" msgid "Asset History" msgstr "" +#. module: account_asset +#: field:asset.modify,asset_method_time:0 +msgid "Asset Method Time" +msgstr "" + #. module: account_asset #: field:account.asset.asset,name:0 msgid "Asset Name" @@ -788,3 +793,9 @@ msgstr "" msgid "months" msgstr "" +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:account_asset.view_asset_depreciation_confirmation_wizard +#: view:asset.modify:account_asset.asset_modify_form +msgid "or" +msgstr "" + diff --git a/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot b/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot index 13faebce50e..fd468012a4d 100644 --- a/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot +++ b/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -381,3 +381,8 @@ msgstr "" msgid "cancel selected statement lines." msgstr "" +#. module: account_bank_statement_extensions +#: view:confirm.statement.line:account_bank_statement_extensions.view_confirm_statement_line +msgid "or" +msgstr "" + diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot index 2841e217466..e321fdf45ce 100644 --- a/addons/account_budget/i18n/account_budget.pot +++ b/addons/account_budget/i18n/account_budget.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -268,7 +268,7 @@ msgid "End of period" msgstr "" #. module: account_budget -#: code:addons/account_budget/account_budget.py:118 +#: code:addons/account_budget/account_budget.py:124 #, python-format msgid "Error!" msgstr "" @@ -424,7 +424,7 @@ msgid "Status" msgstr "" #. module: account_budget -#: code:addons/account_budget/account_budget.py:118 +#: code:addons/account_budget/account_budget.py:124 #, python-format msgid "The Budget '%s' has no accounts!" msgstr "" @@ -486,3 +486,23 @@ msgstr "" msgid "Validated" msgstr "" +#. module: account_budget +#: view:website:account_budget.report_budget +msgid "at" +msgstr "" + +#. module: account_budget +#: view:account.budget.analytic:account_budget.account_budget_analytic_view +#: view:account.budget.crossvered.report:account_budget.account_budget_crossvered_report_view +#: view:account.budget.crossvered.summary.report:account_budget.account_budget_crossvered_summary_report_view +#: view:account.budget.report:account_budget.account_budget_report_view +msgid "or" +msgstr "" + +#. module: account_budget +#: view:website:account_budget.report_analyticaccountbudget +#: view:website:account_budget.report_budget +#: view:website:account_budget.report_crossoveredbudget +msgid "to" +msgstr "" + diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot index cb8fd80584d..7d20d9fc300 100644 --- a/addons/account_cancel/i18n/account_cancel.pot +++ b/addons/account_cancel/i18n/account_cancel.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_check_writing/i18n/account_check_writing.pot b/addons/account_check_writing/i18n/account_check_writing.pot index 017a2bfb059..5daf4bdf3dc 100644 --- a/addons/account_check_writing/i18n/account_check_writing.pot +++ b/addons/account_check_writing/i18n/account_check_writing.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -222,3 +222,8 @@ msgstr "" msgid "Write Checks" msgstr "" +#. module: account_check_writing +#: view:account.check.write:account_check_writing.view_account_check_write +msgid "or" +msgstr "" + diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot index d2590930d4c..cb3e6c65084 100644 --- a/addons/account_followup/i18n/account_followup.pot +++ b/addons/account_followup/i18n/account_followup.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1198,6 +1198,11 @@ msgstr "" msgid "e.g. Call the customer, check if it's paid, ..." msgstr "" +#. module: account_followup +#: view:account_followup.print:account_followup.view_account_followup_print +msgid "or" +msgstr "" + #. module: account_followup #: field:account_followup.print,company_id:0 #: field:res.partner,unreconciled_aml_ids:0 diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot index 344e4803943..736d303b0d0 100644 --- a/addons/account_payment/i18n/account_payment.pot +++ b/addons/account_payment/i18n/account_payment.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -709,3 +709,11 @@ msgstr "" msgid "_Add to payment order" msgstr "" +#. module: account_payment +#: view:account.payment.make.payment:account_payment.account_payment_make_payment_view +#: view:account.payment.populate.statement:account_payment.account_payment_populate_statement_view +#: view:payment.order.create:account_payment.view_create_payment_order +#: view:payment.order.create:account_payment.view_create_payment_order_lines +msgid "or" +msgstr "" + diff --git a/addons/account_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot index 9461640527a..05bf7ccbf9a 100644 --- a/addons/account_sequence/i18n/account_sequence.pot +++ b/addons/account_sequence/i18n/account_sequence.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_test/i18n/account_test.pot b/addons/account_test/i18n/account_test.pot index 44c89af31e8..4ddf1f75eb0 100644 --- a/addons/account_test/i18n/account_test.pot +++ b/addons/account_test/i18n/account_test.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot index 4cae232875e..7004129e309 100644 --- a/addons/account_voucher/i18n/account_voucher.pot +++ b/addons/account_voucher/i18n/account_voucher.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgid "Are you sure you want to unreconcile this record?" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:269 +#: code:addons/account_voucher/account_voucher.py:276 #, python-format msgid "At the operation date, the exchange rate was\n" "%s = %s" @@ -204,7 +204,7 @@ msgid "Cancelled" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:929 +#: code:addons/account_voucher/account_voucher.py:959 #, python-format msgid "Cannot delete voucher(s) which are already opened or paid." msgstr "" @@ -228,7 +228,7 @@ msgid "Computed as the difference between the amount stated in the voucher and t msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1027 +#: code:addons/account_voucher/account_voucher.py:1057 #, python-format msgid "Configuration Error !" msgstr "" @@ -379,8 +379,8 @@ msgid "Effective date for accounting entries" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:511 -#: code:addons/account_voucher/account_voucher.py:1033 +#: code:addons/account_voucher/account_voucher.py:518 +#: code:addons/account_voucher/account_voucher.py:1063 #, python-format msgid "Error!" msgstr "" @@ -416,8 +416,8 @@ msgid "Full Reconcile" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1068 -#: code:addons/account_voucher/account_voucher.py:1074 +#: code:addons/account_voucher/account_voucher.py:1098 +#: code:addons/account_voucher/account_voucher.py:1104 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -464,7 +464,7 @@ msgid "Internal Notes" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:929 +#: code:addons/account_voucher/account_voucher.py:959 #, python-format msgid "Invalid Action!" msgstr "" @@ -561,7 +561,7 @@ msgid "Multi Currency Voucher" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1213 +#: code:addons/account_voucher/account_voucher.py:1243 #, python-format msgid "No Account Base Code and Account Tax Code!" msgstr "" @@ -638,7 +638,6 @@ msgstr "" #. module: account_voucher #: view:account.invoice:account_voucher.view_invoice_supplier -#: view:account.voucher:account_voucher.view_vendor_receipt_dialog_form msgid "Pay" msgstr "" @@ -724,19 +723,19 @@ msgid "Period" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1028 +#: code:addons/account_voucher/account_voucher.py:1058 #, python-format msgid "Please activate the sequence of selected journal !" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1034 +#: code:addons/account_voucher/account_voucher.py:1064 #, python-format msgid "Please define a sequence on the journal." msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:511 +#: code:addons/account_voucher/account_voucher.py:518 #, python-format msgid "Please define default credit/debit accounts on the journal \"%s\"." msgstr "" @@ -825,6 +824,7 @@ msgstr "" #. module: account_voucher #: view:account.invoice:account_voucher.view_invoice_customer +#: view:account.voucher:account_voucher.view_vendor_receipt_dialog_form msgid "Register Payment" msgstr "" @@ -923,7 +923,7 @@ msgstr "" #: view:account.voucher:account_voucher.view_vendor_payment_form #: view:account.voucher:account_voucher.view_voucher_filter_vendor #: view:account.voucher:account_voucher.view_voucher_filter_vendor_pay -#: code:addons/account_voucher/account_voucher.py:182 +#: code:addons/account_voucher/account_voucher.py:187 #, python-format msgid "Supplier" msgstr "" @@ -962,7 +962,7 @@ msgid "The Voucher has been totally paid." msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1172 +#: code:addons/account_voucher/account_voucher.py:1202 #, python-format msgid "The invoice you are willing to pay is not valid anymore." msgstr "" @@ -1005,6 +1005,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:account_voucher.view_voucher_form #: view:account.voucher:account_voucher.view_voucher_tree +#: view:account.voucher:account_voucher.view_voucher_tree_nocreate msgid "Total Amount" msgstr "" @@ -1070,7 +1071,7 @@ msgstr "" #: view:account.voucher:account_voucher.view_voucher_filter_vendor #: view:account.voucher:account_voucher.view_voucher_filter_vendor_pay #: field:account.voucher.line,voucher_id:0 -#: code:addons/account_voucher/account_voucher.py:152 +#: code:addons/account_voucher/account_voucher.py:157 #: model:res.request.link,name:account_voucher.req_link_voucher #, python-format msgid "Voucher" @@ -1078,6 +1079,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:account_voucher.view_voucher_tree +#: view:account.voucher:account_voucher.view_voucher_tree_nocreate #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open msgid "Voucher Entries" msgstr "" @@ -1130,7 +1132,7 @@ msgid "Website communication history" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:370 +#: code:addons/account_voucher/account_voucher.py:377 #, python-format msgid "Write-Off" msgstr "" @@ -1141,33 +1143,33 @@ msgid "Write-Off Analytic Account" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1172 +#: code:addons/account_voucher/account_voucher.py:1202 #, python-format msgid "Wrong voucher line" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1213 +#: code:addons/account_voucher/account_voucher.py:1243 #, python-format msgid "You have to configure account base code and account tax code on the '%s' tax!" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1073 +#: code:addons/account_voucher/account_voucher.py:1103 #, python-format msgid "You should configure the 'Gain Exchange Rate Account' to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1067 +#: code:addons/account_voucher/account_voucher.py:1097 #, python-format msgid "You should configure the 'Loss Exchange Rate Account' to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:1084 -#: code:addons/account_voucher/account_voucher.py:1098 -#: code:addons/account_voucher/account_voucher.py:1249 +#: code:addons/account_voucher/account_voucher.py:1114 +#: code:addons/account_voucher/account_voucher.py:1128 +#: code:addons/account_voucher/account_voucher.py:1279 #, python-format msgid "change" msgstr "" @@ -1186,3 +1188,8 @@ msgstr "" msgid "e.g. Invoice SAJ/0042" msgstr "" +#. module: account_voucher +#: view:account.voucher:account_voucher.view_vendor_receipt_dialog_form +msgid "or" +msgstr "" + diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot index 46b9a814ddf..7bd10824188 100644 --- a/addons/analytic/i18n/analytic.pot +++ b/addons/analytic/i18n/analytic.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/analytic_contract_hr_expense/i18n/analytic_contract_hr_expense.pot b/addons/analytic_contract_hr_expense/i18n/analytic_contract_hr_expense.pot index 1c6dedd8384..3b804d0b433 100644 --- a/addons/analytic_contract_hr_expense/i18n/analytic_contract_hr_expense.pot +++ b/addons/analytic_contract_hr_expense/i18n/analytic_contract_hr_expense.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot index 0650bff2e05..6d9501ab66b 100644 --- a/addons/analytic_user_function/i18n/analytic_user_function.pot +++ b/addons/analytic_user_function/i18n/analytic_user_function.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -131,3 +131,8 @@ msgstr "" msgid "Users/Products Rel." msgstr "" +#. module: analytic_user_function +#: view:hr_timesheet_sheet.sheet:analytic_user_function.hr_timesheet_sheet_form_inherit +msgid "on_change_account_id(account_id, user_id, unit_amount)" +msgstr "" + diff --git a/addons/anonymization/i18n/anonymization.pot b/addons/anonymization/i18n/anonymization.pot index 64fdb4da507..1a9757174d6 100644 --- a/addons/anonymization/i18n/anonymization.pot +++ b/addons/anonymization/i18n/anonymization.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/auth_crypt/i18n/auth_crypt.pot b/addons/auth_crypt/i18n/auth_crypt.pot index 4aa61a87fb4..05ca403a3a6 100644 --- a/addons/auth_crypt/i18n/auth_crypt.pot +++ b/addons/auth_crypt/i18n/auth_crypt.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/auth_ldap/i18n/auth_ldap.pot b/addons/auth_ldap/i18n/auth_ldap.pot index c616b364ea1..81ad517e3a2 100644 --- a/addons/auth_ldap/i18n/auth_ldap.pot +++ b/addons/auth_ldap/i18n/auth_ldap.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/auth_oauth/i18n/auth_oauth.pot b/addons/auth_oauth/i18n/auth_oauth.pot index 7d36b6e32f8..a57dc6d668b 100644 --- a/addons/auth_oauth/i18n/auth_oauth.pot +++ b/addons/auth_oauth/i18n/auth_oauth.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,32 @@ msgstr "" "Plural-Forms: \n" #. module: auth_oauth -#: code:addons/auth_oauth/controllers/main.py:99 +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "- Ceate a new project" +msgstr "" + +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "- Create an oauth client_id" +msgstr "" + +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "- Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname." +msgstr "" + +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "- Go to Api Access" +msgstr "" + +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "- Go to the" +msgstr "" + +#. module: auth_oauth +#: code:addons/auth_oauth/controllers/main.py:100 #, python-format msgid "Access Denied" msgstr "" @@ -73,6 +98,11 @@ msgstr "" msgid "Data URL" msgstr "" +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "Google APIs console" +msgstr "" + #. module: auth_oauth #: field:auth.oauth.provider,id:0 msgid "ID" @@ -88,6 +118,11 @@ msgstr "" msgid "Last Updated on" msgstr "" +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "Now copy paste the client_id here:" +msgstr "" + #. module: auth_oauth #: field:res.users,oauth_access_token:0 msgid "OAuth Access Token" @@ -144,11 +179,16 @@ msgid "Scope" msgstr "" #. module: auth_oauth -#: code:addons/auth_oauth/controllers/main.py:97 +#: code:addons/auth_oauth/controllers/main.py:98 #, python-format msgid "Sign up is not allowed on this database." msgstr "" +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "To setup the signin process with Google, first you have to perform the following steps:" +msgstr "" + #. module: auth_oauth #: model:ir.model,name:auth_oauth.model_res_users msgid "Users" @@ -160,7 +200,7 @@ msgid "Validation URL" msgstr "" #. module: auth_oauth -#: code:addons/auth_oauth/controllers/main.py:101 +#: code:addons/auth_oauth/controllers/main.py:102 #, python-format msgid "You do not have access to this database or your invitation has expired. Please ask for an invitation and be sure to follow the link in your invitation email." msgstr "" @@ -171,6 +211,11 @@ msgstr "" msgid "arch" msgstr "" +#. module: auth_oauth +#: view:base.config.settings:auth_oauth.view_general_configuration +msgid "e.g. 1234-xyz.apps.googleusercontent.com" +msgstr "" + #. module: auth_oauth #: field:auth.oauth.provider,sequence:0 msgid "unknown" diff --git a/addons/auth_openid/i18n/auth_openid.pot b/addons/auth_openid/i18n/auth_openid.pot index 31da9120b18..4a4d8ba99cf 100644 --- a/addons/auth_openid/i18n/auth_openid.pot +++ b/addons/auth_openid/i18n/auth_openid.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot index 0c9297dc72c..a635a4ac086 100644 --- a/addons/auth_signup/i18n/auth_signup.pot +++ b/addons/auth_signup/i18n/auth_signup.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -98,7 +98,7 @@ msgid "Back to Login" msgstr "" #. module: auth_signup -#: code:addons/auth_signup/res_users.py:295 +#: code:addons/auth_signup/res_users.py:294 #, python-format msgid "Cannot send email: user has no email address." msgstr "" diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot index 11f9a666237..e7419a45696 100644 --- a/addons/base_action_rule/i18n/base_action_rule.pot +++ b/addons/base_action_rule/i18n/base_action_rule.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_gengo/i18n/base_gengo.pot b/addons/base_gengo/i18n/base_gengo.pot index 703ff46d32d..a1a588bf4db 100644 --- a/addons/base_gengo/i18n/base_gengo.pot +++ b/addons/base_gengo/i18n/base_gengo.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -275,3 +275,8 @@ msgstr "" msgid "You can select here the service level you want for an automatic translation using Gengo." msgstr "" +#. module: base_gengo +#: view:base.gengo.translations:base_gengo.base_gengo_translation_wizard_from +msgid "or" +msgstr "" + diff --git a/addons/base_geolocalize/i18n/base_geolocalize.pot b/addons/base_geolocalize/i18n/base_geolocalize.pot index 1fd4ee063fa..9f4e3e9f20b 100644 --- a/addons/base_geolocalize/i18n/base_geolocalize.pot +++ b/addons/base_geolocalize/i18n/base_geolocalize.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot index c8dd52f11cb..58b82b0bfbc 100644 --- a/addons/base_iban/i18n/base_iban.pot +++ b/addons/base_iban/i18n/base_iban.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot index 51b6d7bc69f..6ce43b7c004 100644 --- a/addons/base_import/i18n/base_import.pot +++ b/addons/base_import/i18n/base_import.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_import_module/i18n/base_import_module.pot b/addons/base_import_module/i18n/base_import_module.pot index 590de207692..1bc34b502d0 100644 --- a/addons/base_import_module/i18n/base_import_module.pot +++ b/addons/base_import_module/i18n/base_import_module.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -139,3 +139,8 @@ msgstr "" msgid "init" msgstr "" +#. module: base_import_module +#: view:base.import.module:base_import_module.view_base_module_import +msgid "or" +msgstr "" + diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot index f8577be213f..8d8cc11cbb6 100644 --- a/addons/base_report_designer/i18n/base_report_designer.pot +++ b/addons/base_report_designer/i18n/base_report_designer.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -187,6 +187,12 @@ msgstr "" msgid "Your .SXW file" msgstr "" +#. module: base_report_designer +#: view:base.report.sxw:base_report_designer.view_base_report_sxw +#: view:base_report_designer.installer:base_report_designer.view_report_designer_installer +msgid "or" +msgstr "" + #. module: base_report_designer #: view:base_report_designer.installer:base_report_designer.view_report_designer_installer msgid "title" diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot index a4ae58e8131..2d9fb94ee22 100644 --- a/addons/base_setup/i18n/base_setup.pot +++ b/addons/base_setup/i18n/base_setup.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -276,7 +276,7 @@ msgstr "" #. module: base_setup #: help:base.config.settings,module_share:0 -msgid "Share or embbed any screen of openerp." +msgid "Share or embbed any screen of Odoo." msgstr "" #. module: base_setup @@ -344,6 +344,12 @@ msgstr "" msgid "You will find more options in your company details: address for the header and footer, overdue payments texts, etc." msgstr "" +#. module: base_setup +#: view:base.config.settings:base_setup.view_general_configuration +#: view:sale.config.settings:base_setup.view_sale_config_settings +msgid "or" +msgstr "" + #. module: base_setup #: view:base.setup.terminology:base_setup.base_setup_terminology_form msgid "res_config_contents" diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot index f50083c13a4..187db7442af 100644 --- a/addons/base_vat/i18n/base_vat.pot +++ b/addons/base_vat/i18n/base_vat.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot index 721fff71e8a..ec33e7d336d 100644 --- a/addons/board/i18n/board.pot +++ b/addons/board/i18n/board.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -204,3 +204,8 @@ msgstr "" msgid "Title of new dashboard item" msgstr "" +#. module: board +#: view:board.create:board.view_board_create +msgid "or" +msgstr "" + diff --git a/addons/bus/i18n/bus.pot b/addons/bus/i18n/bus.pot index 0016e2af868..bfce074bace 100644 --- a/addons/bus/i18n/bus.pot +++ b/addons/bus/i18n/bus.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0rc1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-14 13:08+0000\n" -"PO-Revision-Date: 2014-08-14 13:08+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot index f58afe1a5c3..57c6471cbbc 100644 --- a/addons/calendar/i18n/calendar.pot +++ b/addons/calendar/i18n/calendar.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 16:27+0000\n" -"PO-Revision-Date: 2014-09-23 16:27+0000\n" +"POT-Creation-Date: 2015-01-21 14:07+0000\n" +"PO-Revision-Date: 2015-01-21 14:07+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -417,7 +417,7 @@ msgid "
\n"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1570
+#: code:addons/calendar/calendar.py:1593
#, python-format
msgid "A email has been send to specify that the date has been changed !"
msgstr ""
@@ -451,7 +451,7 @@ msgid "All Day"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:772
+#: code:addons/calendar/calendar.py:776
#, python-format
msgid "AllDay , %s"
msgstr ""
@@ -462,13 +462,13 @@ msgid "Amount"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1080
+#: code:addons/calendar/calendar.py:1096
#, python-format
msgid "An invitation email has been sent to attendee %s"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1384
+#: code:addons/calendar/calendar.py:1407
#, python-format
msgid "An invitation email has been sent to attendee(s)"
msgstr ""
@@ -502,7 +502,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1655
+#: code:addons/calendar/calendar.py:1678
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -660,7 +660,7 @@ msgid "Email"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1358
+#: code:addons/calendar/calendar.py:1381
#, python-format
msgid "Email addresses not found"
msgstr ""
@@ -701,7 +701,7 @@ msgid "Error ! End date cannot be set before start date."
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1237
+#: code:addons/calendar/calendar.py:1260
#, python-format
msgid "Error!"
msgstr ""
@@ -744,7 +744,7 @@ msgid "First"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:140
+#: code:addons/calendar/calendar.py:141
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
@@ -786,7 +786,7 @@ msgid "Group By"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1593
+#: code:addons/calendar/calendar.py:1616
#, python-format
msgid "Group by date is not supported, use the calendar view instead."
msgstr ""
@@ -1278,7 +1278,7 @@ msgid "The"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1354
+#: code:addons/calendar/calendar.py:1377
#, python-format
msgid "The following contacts have no email address :"
msgstr ""
@@ -1352,9 +1352,9 @@ msgid "Update only this instance"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:103
-#: code:addons/calendar/calendar.py:140
-#: code:addons/calendar/calendar.py:1593
+#: code:addons/calendar/calendar.py:104
+#: code:addons/calendar/calendar.py:141
+#: code:addons/calendar/calendar.py:1616
#, python-format
msgid "Warning!"
msgstr ""
@@ -1418,7 +1418,7 @@ msgid "Yes I'm going."
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:103
+#: code:addons/calendar/calendar.py:104
#, python-format
msgid "You cannot duplicate a calendar attendee."
msgstr ""
@@ -1434,7 +1434,7 @@ msgid "colorize"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1224
+#: code:addons/calendar/calendar.py:1247
#, python-format
msgid "count cannot be negative or 0."
msgstr ""
@@ -1445,14 +1445,14 @@ msgid "duration_minutes"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1222
+#: code:addons/calendar/calendar.py:1245
#, python-format
msgid "interval cannot be negative."
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1222
-#: code:addons/calendar/calendar.py:1224
+#: code:addons/calendar/calendar.py:1245
+#: code:addons/calendar/calendar.py:1247
#, python-format
msgid "warning!"
msgstr ""
diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
index b0fbc53c2d1..da5821afbf5 100644
--- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot
+++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/contacts/i18n/contacts.pot b/addons/contacts/i18n/contacts.pot
index 17bd5c02b92..56bb4e5698f 100644
--- a/addons/contacts/i18n/contacts.pot
+++ b/addons/contacts/i18n/contacts.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 8bb4a483f69..310f7e5f9ef 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -796,7 +796,7 @@ msgid "Current Line"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:989
+#: code:addons/crm/crm_lead.py:998
#: view:crm.lead:crm.crm_case_form_view_leads
#: view:crm.lead:crm.crm_case_form_view_oppor
#: view:crm.lead:crm.crm_case_tree_view_oppor
@@ -810,7 +810,7 @@ msgid "Customer"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:991
+#: code:addons/crm/crm_lead.py:1000
#, python-format
msgid "Customer Email"
msgstr ""
@@ -987,7 +987,7 @@ msgid "Error"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:430
+#: code:addons/crm/crm_lead.py:434
#, python-format
msgid "Error!"
msgstr ""
@@ -1114,7 +1114,7 @@ msgid "Force assignation"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:562
+#: code:addons/crm/crm_lead.py:564
#, python-format
msgid "From %s : %s"
msgstr ""
@@ -1346,7 +1346,7 @@ msgid "Last Updated on"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:884
+#: code:addons/crm/crm_lead.py:893
#: selection:crm.case.stage,type:0
#: view:crm.lead:crm.crm_case_form_view_oppor
#: selection:crm.lead,type:0
@@ -1512,7 +1512,7 @@ msgid "Logged Calls"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1049
+#: code:addons/crm/crm_lead.py:1058
#, python-format
msgid "Logged a call for %(date)s. %(description)s"
msgstr ""
@@ -1613,7 +1613,7 @@ msgid "Meeting"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1063
+#: code:addons/crm/crm_lead.py:1072
#, python-format
msgid "Meeting scheduled at '%s' This course is dedicated to developers who need to grasp knowledge of the business applications development process. This course is for new developers or for IT professionals eager to learn more about technical aspects. Introduction to Javascript Odoo Web Client Building a Full Application Objectives: Having attended this course, participants should be able to: Our prices include: Requirements: To get more information, visit the Odoo Official Website. I did not expect such a great learning experience. I feel like I can develop anything now. This course help me build my first application within a month. Definetly worth its price. You will be redirected to the Adyen website after clicking on the payment button. You will be redirected to the Buckaroo website after clicking on the payment button. You will be redirected to the Ogone website after clicking on the payment button. You will be redirected to the Paypal website after clicking on the payment button. Transfer information will be provided after choosing the payment mode. \n"
" "
msgstr ""
+#. module: portal_project
+#: code:addons/portal_project/project.py:33
+#, python-format
+msgid "Customer related project: visible through portal"
+msgstr ""
+
#. module: portal_project
#: model:ir.model,name:portal_project.model_project_project
msgid "Project"
diff --git a/addons/portal_project_issue/i18n/portal_project_issue.pot b/addons/portal_project_issue/i18n/portal_project_issue.pot
index 64ebf820b15..f23dfb816f9 100644
--- a/addons/portal_project_issue/i18n/portal_project_issue.pot
+++ b/addons/portal_project_issue/i18n/portal_project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/portal_sale/i18n/portal_sale.pot b/addons/portal_sale/i18n/portal_sale.pot
index 74b86229d50..3fd99b28b5d 100644
--- a/addons/portal_sale/i18n/portal_sale.pot
+++ b/addons/portal_sale/i18n/portal_sale.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/pos_discount/i18n/pos_discount.pot b/addons/pos_discount/i18n/pos_discount.pot
index 63ada984933..35922c816ec 100644
--- a/addons/pos_discount/i18n/pos_discount.pot
+++ b/addons/pos_discount/i18n/pos_discount.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot
index 39d765e05e4..a90a0d4d03a 100644
--- a/addons/pos_restaurant/i18n/pos_restaurant.pot
+++ b/addons/pos_restaurant/i18n/pos_restaurant.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 1816c19f5ae..cea1ce2b068 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -292,7 +292,7 @@ msgid "Name"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:213
+#: code:addons/procurement/procurement.py:212
#, python-format
msgid "No rule matching this procurement"
msgstr ""
@@ -541,3 +541,8 @@ msgstr ""
msgid "e.g. SO005"
msgstr ""
+#. module: procurement
+#: view:procurement.order.compute.all:procurement.view_compute_schedulers_wizard
+msgid "or"
+msgstr ""
+
diff --git a/addons/procurement_jit/i18n/procurement_jit.pot b/addons/procurement_jit/i18n/procurement_jit.pot
index 0c3d5c21903..e5814750643 100644
--- a/addons/procurement_jit/i18n/procurement_jit.pot
+++ b/addons/procurement_jit/i18n/procurement_jit.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 425e4df77e0..22559f142ce 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid "# of Product Variants"
msgstr ""
#. module: product
-#: code:addons/product/product.py:725
-#: code:addons/product/product.py:1070
+#: code:addons/product/product.py:757
+#: code:addons/product/product.py:1111
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -86,6 +86,36 @@ msgid "7.9‑inch (diagonal) LED-backlit, 128Gb\n"
"FaceTime HD Camera, 1.2 MP Photos"
msgstr ""
+#. module: product
+#: view:product.template:product.product_template_only_form_view
+msgid ": adding or deleting attributes\n"
+" will delete and recreate existing variants and lead\n"
+" to the loss of their possible customizations."
+msgstr ""
+
+#. module: product
+#: model:product.template,website_description:product.product_product_9_product_template
+msgid " \n"
+" The incredibly thin Apple Wireless Keyboard uses Bluetooth technology,\n"
+" which makes it compatible with iPad. And you’re free to type wherever\n"
+" you like — with the keyboard in front of your iPad or on your lap.\n"
+" \n"
@@ -206,6 +236,475 @@ msgid " \n"
" "
msgstr ""
+#. module: product
+#: model:product.template,website_description:product.product_product_11_product_template
+#: model:product.template,website_description:product.product_product_11b_product_template
+msgid " \n"
+" About the size of a credit card — and just 5.4 mm thin — iPod nano is the thinnest iPod ever made.\n"
+" The 2.5-inch Multi-Touch display is nearly twice as big as the display on the previous iPod nano,\n"
+" so you can see more of the music, photos, and videos you love.\n"
+" \n"
+" Buttons let you quickly play, pause, change songs, or adjust the volume.\n"
+" The smooth anodized aluminum design makes iPod nano feel as good as it sounds.\n"
+" And iPod nano wouldn’t be iPod nano without gorgeous, hard-to-choose-from color.\n"
+" \n"
+" Tap to play your favorite songs. Or entire albums.\n"
+" Or everything by one artist. You can even browse by genres or composers.\n"
+" Flip through your music: Album art looks great on the bigger screen.\n"
+" Or to keep things fresh, give iPod nano a shake and it shuffles to a different song in your music library.\n"
+" \n"
+" Say you’re listening to a song you love and you want to stay in the mood.\n"
+" Just tap Genius. It finds other songs on iPod nano that go great together\n"
+" and makes a Genius playlist for you. For more song combinations\n"
+" you wouldn’t have thought of yourself, create Genius Mixes in iTunes\n"
+" and sync the ones you like to iPod nano. Then tap Genius Mixes and\n"
+" rediscover songs you haven’t heard in a while — or find music you forgot you even had.\n"
+" \n"
+" iTunes on your Mac or PC makes it easy to load up\n"
+" your iPod. Just choose the playlists, audiobooks,\n"
+" podcasts, and other audio files you want, then sync.\n"
+" \n"
+" You probably have multiple playlists in iTunes on your computer.\n"
+" One for your commute. One for the gym. Sync those playlists\n"
+" to iPod, and you can play the perfect mix for whatever\n"
+" mood strikes you. VoiceOver tells you the name of each playlist,\n"
+" so it’s easy to switch between them and find the one you want without looking.\n"
+" \n"
+" There’s another way to get a good mix of music on iPod: Let Genius do the work.\n"
+" Activate Genius in iTunes on your computer, and it automatically finds songs that sound\n"
+" great together. Then it creates Genius Mixes, which you can easily sync to your iPod.\n"
+" It’s the perfect way to rediscover songs you haven’t listened to in forever.\n"
+" \n"
+" Creating such a stunningly thin design took some equally stunning feats of technological innovation. We refined,re-imagined,or re-engineered everything about iMac from the inside out. The result is an advanced, elegant all-in-one computer that’s as much a work of art as it is state of the art.\n"
+" \n"
+" How did we make an already gorgeous widescreen display even better? By making it 75 percent less reflective. And by re-architecting the LCD and moving it right up against the cover glass. So you see your photos, games, movies, and everything else in vivid, lifelike detail. \n"
+" \n"
+" Powered by fourth-generation Intel Core processors, this iMac is the fastest yet. Every model in the lineup comes standard with a quad-core Intel Core i5 processor, starting at 2.7GHz and topping out at 3.4GHz.\n"
+" \n"
+" And at the Apple Online Store, you can configure your iMac with an even more powerful Intel Core i7 processor, up to 3.5GHz.\n"
+" \n"
+" 75 percent less reflection.\n"
+" \n"
+" Individually calibrated for true-to-life color.\n"
+" \n"
+" More energy efficient.\n"
+" \n"
+" Friendly to the environment.\n"
+" \n"
+" Highly rated designs.\n"
+" \n"
+" Everything you love about iPad — the beautiful screen,\n"
+" fast and fluid performance, FaceTime and iSight cameras, \n"
+" thousands of amazing apps, 10-hour battery life* — is everything\n"
+" you’ll love about iPad mini, too. And you can hold it in one hand.\n"
+" \n"
+" Everything you love about iPad — the beautiful\n"
+" screen, fast Colors are vivid and text is sharp on the iPad mini display.\n"
+" But what really makes it stand out is its size. At 7.9 inches,\n"
+" it’s perfectly sized to deliver an experience every bit as big as iPad.\n"
+" \n"
+" Right from the start, apps made for iPad also work with iPad mini.\n"
+" They’re immersive, full-screen apps that let you do almost anything\n"
+" you can imagine. And with automatic updates,\n"
+" you're always getting the best experience possible.\n"
+" \n"
+" Right from the start, there’s a lot to love about iPad.\n"
+" It’s simple yet powerful. Thin and light yet full-\n"
+" featured. It can do just about everything and be just\n"
+" about anything.And because it’s so easy to use, it’s\n"
+" easy to love.\n"
+" \n"
+" With advanced Wi‑Fi that’s up to twice as fast as\n"
+" any previous-generation iPad and access to fast\n"
+" cellular data networks around the world, iPad mini\n"
+" lets you download content, stream video,\n"
+" and browse the web at amazing speeds.\n"
+" \n"
+" Right from the start, there’s a lot to love about\n"
+" iPad. It’s simple yet powerful. Thin and light yet\n"
+" full-featured. It can do just about everything and\n"
+" be just about anything.\n"
+" \n"
+" And because it’s so easy to use, it’s easy to love.\n"
+" \n"
+" Everything you love about iPad — the beautiful\n"
+" screen, fast and fluid performance, FaceTime and\n"
+" iSight cameras, thousands of amazing apps, 10-hour\n"
+" battery life* — is everything you’ll love about\n"
+" iPad mini, too. And you can hold it in one hand.\n"
+" \n"
+" The Bose® SoundLink® mini is Bose's smallest portable Bluetooth speaker. Its ultra-compact size fits in the \n"
+" palm of your hand, yet gives you full, natural sound wirelessly from your iPhone, iPad, or iPod. Grab it and go \n"
+" full-featured. It can do just about everything and\n"
+" experience music just about anywhere.\n"
+" \n"
+" The SoundLink® Mini speaker is small and light enough\n"
+" to tuck into your bag. It weighs in at just 1.5 pounds.\n"
+" Its low profile lets you place it almost anywhere and\n"
+" provides a low center of gravity that makes it nearly\n"
+" impossible to tip over.\n"
+" \n"
+" The rechargeable lithium-ion battery delivers up to seven hours of playtime.\n"
+" And at home, you can listen even longer—the charging cradle lets\n"
+" you listen while it charges.\n"
+" \n"
+" The speaker has a range of about 30 feet, so you can enjoy\n"
+" the sound you want without wires. It pairs easily with your\n"
+" smartphone, iPad® or other Bluetooth device.\n"
+" And it remembers the most recent six devices you've used,\n"
+" so reconnecting is even simpler.\n"
+" \n"
+" Charging cradle recharges the battery and serves as a convenient\n"
+" home base for your speaker, and it lets you play while it charges.\n"
+" \n"
+" Wall charger can be plugged into the cradle or directly into the speaker\n"
+" \n"
+" Auxiliary port lets you connect other audio sources, like an MP3 player\n"
+" \n"
+" USB port allows for software update to ensure ongoing Bluetooth device compatibility\n"
+" \n"
+" Soft covers are available separately in blue, green or orange. Pick a color to match your style.\n"
+" \n"
+" Unlike many small headphones, each earpiece of the Apple In-Ear Headphones\n"
+" contains two separate high-performance drivers — a woofer to handle bass and\n"
+" mid-range sounds and a tweeter for high-frequency audio. These dedicated\n"
+" drivers help ensure accurate, detailed sound across the entire sonic spectrum.\n"
+" The result: you’re immersed in the music and hear details you never knew existed.\n"
+" Even when listening to an old favorite, you may feel like you’re hearing it for the first time.\n"
+" \n"
+" The Apple In-Ear Headphones deliver a truly immersive sound experience by drastically\n"
+" reducing unwanted outside noises. The soft, silicone ear tips fit snugly and comfortably\n"
+" in your ear, creating a seal that isolates your music from your surroundings.\n"
+" Three different sizes of ear tips are included so you can find a perfect fit for each ear.\n"
+" Also included are a convenient carrying case for the ear tips and a cable-control case\n"
+" for the headphones themselves.\n"
+" \n"
+" Inside each earpiece is a stainless steel mesh cap that protects the precision acoustic\n"
+" components from dust and debris. You can remove the caps for cleaning or replace\n"
+" them with an extra set that’s included in the box.\n"
+" \n"
" Click to create a request for quotation.\n"
" \n"
-" The quotation contains the history of the discussion/negociation\n"
+" The quotation contains the history of the discussion/negotiation\n"
" you had with your supplier. Once confirmed, a request for\n"
" quotation is converted into a purchase order.\n"
" \n"
@@ -474,8 +474,8 @@ msgid "Bid Valid Until"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1160
-#: code:addons/purchase/stock.py:179
+#: code:addons/purchase/purchase.py:1171
+#: code:addons/purchase/stock.py:192
#, python-format
msgid "Buy"
msgstr ""
@@ -499,7 +499,13 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:182
+#: code:addons/purchase/purchase.py:1189
+#, python-format
+msgid "Can not cancel this procurement as the related purchase order has been confirmed already. Please cancel the purchase order first. "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/stock.py:195
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -520,7 +526,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1007
+#: code:addons/purchase/purchase.py:1016
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -554,7 +560,7 @@ msgid "Company"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:506
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Compose Email"
msgstr ""
@@ -565,7 +571,7 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1214
+#: code:addons/purchase/purchase.py:1231
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -635,7 +641,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Date Req."
msgstr ""
@@ -690,13 +696,13 @@ msgid "Default invoicing control method"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:546
+#: code:addons/purchase/purchase.py:555
#, python-format
msgid "Define an expense account for this product: \"%s\" (id:%d)."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:590
+#: code:addons/purchase/purchase.py:599
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -718,8 +724,8 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,name:0
-#: view:website:purchase.report_purchaseorder
-#: view:website:purchase.report_purchasequotation
+#: view:website:purchase.report_purchaseorder_document
+#: view:website:purchase.report_purchasequotation_document
msgid "Description"
msgstr ""
@@ -757,7 +763,7 @@ msgid "Draft PO"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1366
+#: code:addons/purchase/purchase.py:1384
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -779,11 +785,13 @@ msgid "Email composition wizard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:404
-#: code:addons/purchase/purchase.py:529
-#: code:addons/purchase/purchase.py:546
-#: code:addons/purchase/purchase.py:589
-#: code:addons/purchase/stock.py:182
+#: code:addons/purchase/purchase.py:159
+#: code:addons/purchase/purchase.py:413
+#: code:addons/purchase/purchase.py:538
+#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:598
+#: code:addons/purchase/purchase.py:1188
+#: code:addons/purchase/stock.py:195
#, python-format
msgid "Error!"
msgstr ""
@@ -798,7 +806,7 @@ msgstr ""
#: view:purchase.order:purchase.view_request_for_quotation_filter
#: field:purchase.order,minimum_planned_date:0
#: field:purchase.report,expected_date:0
-#: view:website:purchase.report_purchasequotation
+#: view:website:purchase.report_purchasequotation_document
msgid "Expected Date"
msgstr ""
@@ -866,7 +874,7 @@ msgid "In Shipments"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:328
+#: code:addons/purchase/purchase.py:337
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -909,8 +917,8 @@ msgid "International Commercial Terms are a series of predefined commercial term
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:328
-#: code:addons/purchase/purchase.py:1007
+#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:1016
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -947,13 +955,13 @@ msgid "Invoice Received"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1482
+#: code:addons/purchase/purchase.py:1500
#, python-format
msgid "Invoice paid"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1462
+#: code:addons/purchase/purchase.py:1480
#, python-format
msgid "Invoice received"
msgstr ""
@@ -1049,6 +1057,12 @@ msgstr ""
msgid "Location & Warehouse"
msgstr ""
+#. module: purchase
+#: code:addons/purchase/purchase.py:159
+#, python-format
+msgid "Make sure you have at least an incoming picking type defined"
+msgstr ""
+
#. module: purchase
#: field:purchase.config.settings,module_purchase_requisition:0
msgid "Manage calls for bids"
@@ -1115,7 +1129,7 @@ msgid "Monthly Purchases"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Net Price"
msgstr ""
@@ -1125,19 +1139,19 @@ msgid "New Mail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1205
+#: code:addons/purchase/purchase.py:1222
#, python-format
msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1203
+#: code:addons/purchase/purchase.py:1220
#, python-format
msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1201
+#: code:addons/purchase/purchase.py:1218
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -1185,7 +1199,7 @@ msgid "Order Date"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Order Date:"
msgstr ""
@@ -1228,7 +1242,7 @@ msgid "Orders"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Our Order Reference:"
msgstr ""
@@ -1238,7 +1252,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1346
+#: code:addons/purchase/purchase.py:1363
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1271,7 +1285,7 @@ msgid "Picking List"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:404
+#: code:addons/purchase/purchase.py:413
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1387,7 +1401,7 @@ msgid "Products by Category"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:842
+#: code:addons/purchase/purchase.py:851
#, python-format
msgid "Products received"
msgstr ""
@@ -1437,7 +1451,7 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Purchase Order Confirmation N°"
msgstr ""
@@ -1489,7 +1503,7 @@ msgid "Purchase Pricelist"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1368
+#: code:addons/purchase/purchase.py:1386
#, python-format
msgid "Purchase line created and linked to an existing Purchase Order"
msgstr ""
@@ -1530,8 +1544,8 @@ msgid "Put an address if you want to deliver directly from the supplier to the c
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
-#: view:website:purchase.report_purchasequotation
+#: view:website:purchase.report_purchaseorder_document
+#: view:website:purchase.report_purchasequotation_document
msgid "Qty"
msgstr ""
@@ -1541,7 +1555,7 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1370
+#: code:addons/purchase/purchase.py:1388
#, python-format
msgid "Quantity added in existing Purchase Order Line"
msgstr ""
@@ -1579,8 +1593,8 @@ msgid "RFQ Done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:318
-#: code:addons/purchase/purchase.py:936
+#: code:addons/purchase/purchase.py:327
+#: code:addons/purchase/purchase.py:945
#, python-format
msgid "RFQ created"
msgstr ""
@@ -1648,7 +1662,7 @@ msgid "Reference of the sales order or bid sent by your supplier. It's mainly us
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchasequotation
+#: view:website:purchase.report_purchasequotation_document
msgid "Regards,"
msgstr ""
@@ -1661,12 +1675,12 @@ msgstr ""
#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
#: view:purchase.order:purchase.purchase_order_form
#: selection:purchase.report,state:0
-#: view:website:purchase.report_purchasequotation
+#: view:website:purchase.report_purchasequotation_document
msgid "Request for Quotation"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Request for Quotation N°"
msgstr ""
@@ -1711,7 +1725,7 @@ msgid "Select an Open Sales Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1104
+#: code:addons/purchase/purchase.py:1114
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure."
msgstr ""
@@ -1738,9 +1752,9 @@ msgid "Shipping Exception"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
-#: view:website:purchase.report_purchasequotation
-msgid "Shipping address :"
+#: view:website:purchase.report_purchaseorder_document
+#: view:website:purchase.report_purchasequotation_document
+msgid "Shipping address:"
msgstr ""
#. module: purchase
@@ -1803,7 +1817,7 @@ msgid "Supplier Inv."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:435
+#: code:addons/purchase/purchase.py:444
#: code:addons/purchase/wizard/purchase_line_invoice.py:115
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:purchase.res_partner_view_purchase_account_buttons
@@ -1819,7 +1833,7 @@ msgstr ""
#. module: purchase
#: field:purchase.order,amount_tax:0
#: field:purchase.order.line,taxes_id:0
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Taxes"
msgstr ""
@@ -1844,19 +1858,19 @@ msgid "The pricelist sets the currency used for this purchase order. It also com
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1214
+#: code:addons/purchase/purchase.py:1231
#, python-format
msgid "The product \"%s\" has been defined with your company as reseller which seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1123
+#: code:addons/purchase/purchase.py:1134
#, python-format
msgid "The selected supplier has a minimal quantity set to %s %s, you should not purchase less."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1119
+#: code:addons/purchase/purchase.py:1130
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1877,7 +1891,7 @@ msgid "The total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1318
+#: code:addons/purchase/purchase.py:1335
#, python-format
msgid "There is no supplier associated to product %s"
msgstr ""
@@ -1902,14 +1916,9 @@ msgstr ""
msgid "This will determine picking type of incoming shipment"
msgstr ""
-#. module: purchase
-#: view:product.template:purchase.product_template_search_view_purchase
-msgid "To Purchase"
-msgstr ""
-
#. module: purchase
#: field:purchase.order,amount_total:0
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Total"
msgstr ""
@@ -1924,7 +1933,7 @@ msgid "Total Untaxed amount"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Total Without Taxes"
msgstr ""
@@ -1934,13 +1943,13 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:694
#, python-format
msgid "Unable to cancel the purchase order %s."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:691
+#: code:addons/purchase/purchase.py:700
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -1952,7 +1961,7 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,price_unit:0
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Unit Price"
msgstr ""
@@ -2008,8 +2017,8 @@ msgid "User"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
-#: view:website:purchase.report_purchasequotation
+#: view:website:purchase.report_purchaseorder_document
+#: view:website:purchase.report_purchasequotation_document
msgid "VAT:"
msgstr ""
@@ -2019,7 +2028,7 @@ msgid "Validated By"
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Validated By:"
msgstr ""
@@ -2045,9 +2054,9 @@ msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1104
-#: code:addons/purchase/purchase.py:1119
-#: code:addons/purchase/purchase.py:1123
+#: code:addons/purchase/purchase.py:1114
+#: code:addons/purchase/purchase.py:1130
+#: code:addons/purchase/purchase.py:1134
#: code:addons/purchase/wizard/purchase_order_group.py:44
#, python-format
msgid "Warning!"
@@ -2069,25 +2078,37 @@ msgid "When products are bought, they can be delivered to this warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:529
+#: code:addons/purchase/purchase.py:538
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:686
+#: code:addons/purchase/purchase.py:695
#, python-format
msgid "You have already received some goods for it. "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:692
+#: code:addons/purchase/purchase.py:701
#, python-format
msgid "You must first cancel all invoices related to this purchase order."
msgstr ""
#. module: purchase
-#: view:website:purchase.report_purchaseorder
+#: view:website:purchase.report_purchaseorder_document
msgid "Your Order Reference"
msgstr ""
+#. module: purchase
+#: view:purchase.config.settings:purchase.view_purchase_configuration
+#: view:purchase.order.group:purchase.view_purchase_order_group
+#: view:purchase.order.line_invoice:purchase.view_purchase_line_invoice
+msgid "or"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,related_usage:0
+msgid "unknown"
+msgstr ""
+
diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
index 1b73dd8e10d..0820db8f4d4 100644
--- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
+++ b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/purchase_double_validation/i18n/purchase_double_validation.pot b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
index dc4ad97b88f..b6346c3d3de 100644
--- a/addons/purchase_double_validation/i18n/purchase_double_validation.pot
+++ b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 2c010a3717d..d57c578a609 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:purchase_requisition.view_purchase_requisition_filter
-msgid "Call for Bids in negociation"
+msgid "Call for Bids in negotiation"
msgstr ""
#. module: purchase_requisition
@@ -130,7 +130,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:292
+#: code:addons/purchase_requisition/purchase_requisition.py:293
#, python-format
msgid "Cancelled by the call for bids associated to this request for quotation."
msgstr ""
@@ -368,6 +368,11 @@ msgstr ""
msgid "Order Date"
msgstr ""
+#. module: purchase_requisition
+#: view:purchase.requisition:purchase_requisition.view_purchase_requisition_filter
+msgid "Ordering Date"
+msgstr ""
+
#. module: purchase_requisition
#: selection:purchase.requisition,state:0
msgid "PO Created"
@@ -463,7 +468,7 @@ msgid "Purchase Requisition Partner"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:414
+#: code:addons/purchase_requisition/purchase_requisition.py:416
#, python-format
msgid "Purchase Requisition created"
msgstr ""
@@ -496,7 +501,7 @@ msgid "Quantity Bid"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:191
+#: code:addons/purchase_requisition/purchase_requisition.py:192
#, python-format
msgid "RFQ created"
msgstr ""
@@ -601,11 +606,6 @@ msgstr ""
msgid "Source:"
msgstr ""
-#. module: purchase_requisition
-#: view:purchase.requisition:purchase_requisition.view_purchase_requisition_filter
-msgid "Start Month"
-msgstr ""
-
#. module: purchase_requisition
#: view:purchase.requisition:purchase_requisition.view_purchase_requisition_filter
#: field:purchase.requisition,state:0
@@ -675,9 +675,9 @@ msgid "Warehouse"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:188
-#: code:addons/purchase_requisition/purchase_requisition.py:239
-#: code:addons/purchase_requisition/purchase_requisition.py:248
+#: code:addons/purchase_requisition/purchase_requisition.py:189
+#: code:addons/purchase_requisition/purchase_requisition.py:240
+#: code:addons/purchase_requisition/purchase_requisition.py:249
#, python-format
msgid "Warning!"
msgstr ""
@@ -693,19 +693,19 @@ msgid "Website communication history"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:239
+#: code:addons/purchase_requisition/purchase_requisition.py:240
#, python-format
msgid "You have already generate the purchase order(s)."
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:188
+#: code:addons/purchase_requisition/purchase_requisition.py:189
#, python-format
msgid "You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation."
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:248
+#: code:addons/purchase_requisition/purchase_requisition.py:249
#, python-format
msgid "You have no line selected for buying."
msgstr ""
@@ -720,3 +720,9 @@ msgstr ""
msgid "e.g. PO0025"
msgstr ""
+#. module: purchase_requisition
+#: view:bid.line.qty:purchase_requisition.view_bid_line_qty
+#: view:purchase.requisition.partner:purchase_requisition.view_purchase_requisition_partner
+msgid "or"
+msgstr ""
+
diff --git a/addons/report/i18n/report.pot b/addons/report/i18n/report.pot
index 6b31a3f88c9..6f51eb20da7 100644
--- a/addons/report/i18n/report.pot
+++ b/addons/report/i18n/report.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -141,7 +141,7 @@ msgid "B9 23 33 x 62 mm"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:290
+#: code:addons/report/models/report.py:295
#, python-format
msgid "Bad Report Reference"
msgstr ""
@@ -346,16 +346,16 @@ msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:62
-#: code:addons/report/static/src/js/qwebactionmanager.js:70
-#: code:addons/report/static/src/js/qwebactionmanager.js:77
+#: code:addons/report/static/src/js/qwebactionmanager.js:67
+#: code:addons/report/static/src/js/qwebactionmanager.js:75
+#: code:addons/report/static/src/js/qwebactionmanager.js:82
#: model:ir.model,name:report.model_report
#, python-format
msgid "Report"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:438
+#: code:addons/report/models/report.py:449
#, python-format
msgid "Report (PDF)"
msgstr ""
@@ -388,7 +388,7 @@ msgid "Tabloid 29 279.4 x 431.8 mm"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:291
+#: code:addons/report/models/report.py:296
#, python-format
msgid "This report is not loaded into the database: %s."
msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:62
+#: code:addons/report/static/src/js/qwebactionmanager.js:67
#, python-format
msgid "Unable to find Wkhtmltopdf on this \n"
"system. The report will be shown in html. We could not find a picking to display. \n"
+" Hello ${object.name},\n"
+" \n"
+" You have been invited to validate your email in order to get access to \"${object.company_id.name}\" Q/A Forums.\n"
+" \n"
+" To validate your email, please click on the following link:\n"
+" \n"
+" Thanks,\n"
+" A new answer for %s has been posted. Click here to access the post. A new question %s has been asked on %s. Click here to access the question. This community is for professionals and enthusiasts of our products and services. Hello ${object.partner_id.name}, Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: \n"
+" REFERENCES \n"
+" You can access this document and pay online via our Customer Portal:\n"
+" It is also possible to directly pay with Paypal: If you have any question, do not hesitate to contact us. Thank you for choosing ${object.company_id.name or 'us'}!
Subject: %s
Duration: %s hour(s)"
msgstr ""
@@ -1686,25 +1686,25 @@ msgid "Merge with existing opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:547
+#: code:addons/crm/crm_lead.py:549
#, python-format
msgid "Merged lead"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:541
+#: code:addons/crm/crm_lead.py:543
#, python-format
msgid "Merged leads"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:543
+#: code:addons/crm/crm_lead.py:545
#, python-format
msgid "Merged opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:547
+#: code:addons/crm/crm_lead.py:549
#, python-format
msgid "Merged opportunity"
msgstr ""
@@ -1800,8 +1800,6 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead1
#: view:crm.lead:crm.view_crm_case_opportunities_filter
-#: view:crm.lead.report:crm.view_report_crm_lead_filter
-#: view:crm.opportunity.report:crm.view_report_crm_opportunity_filter
msgid "New"
msgstr ""
@@ -1830,13 +1828,13 @@ msgid "Next Action Date"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1004
+#: code:addons/crm/crm_lead.py:1013
#, python-format
msgid "No Subject"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:761
+#: code:addons/crm/crm_lead.py:770
#, python-format
msgid "No customer name defined. Please fill one of the following fields: Company Name, Contact Name or Email (\"Name 5 Intensive Days
\n"
+" to learn .JS development
\n"
+" Course Summary
\n"
+"What you will learn?
\n"
+"Day 1
\n"
+"\n"
+"
\n"
+"Day 2
\n"
+"\n"
+"
\n"
+"Day 3
\n"
+"\n"
+"
\n"
+"Requirements
\n"
+"
\n"
+"\n"
+"
\n"
+"\n"
+"
\n"
+"\n"
+"Read Great Contents
\n"
+"\n"
+"What do people say about this course?
\n"
+"\n"
+"
\n"
+"\n"
+"
\n"
+"5 Intensive Days
\n"
+" to learn business applications development
\n"
+" 5 Intensive Days
\n"
+" to learn technical aspects
\n"
+"
Nobody has succeeded to reach every goal, no badge is rewared for this challenge."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:743
+#: code:addons/gamification/models/challenge.py:754
#, python-format
msgid "
Reward (badge %s) for every succeeding user was sent to %s."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:752
+#: code:addons/gamification/models/challenge.py:763
#, python-format
msgid "
Special rewards were sent to the top competing users. The ranking for this challenge is :"
msgstr ""
@@ -328,7 +328,7 @@ msgid "Can not grant"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:453
+#: code:addons/gamification/models/goal.py:457
#, python-format
msgid "Can not modify the configuration of a started goal"
msgstr ""
@@ -598,9 +598,9 @@ msgid "End Date"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:553
+#: code:addons/gamification/models/challenge.py:561
#: code:addons/gamification/models/goal.py:148
-#: code:addons/gamification/models/goal.py:453
+#: code:addons/gamification/models/goal.py:457
#, python-format
msgid "Error!"
msgstr ""
@@ -933,7 +933,7 @@ msgid "Inherited models"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:319
+#: code:addons/gamification/models/goal.py:334
#, python-format
msgid "Invalid return content from the evaluation of code for definition %s"
msgstr ""
@@ -1136,7 +1136,7 @@ msgid "No one, assigned through challenges"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:755
+#: code:addons/gamification/models/challenge.py:766
#, python-format
msgid "Nobody reached the required conditions to receive special badges."
msgstr ""
@@ -1312,7 +1312,7 @@ msgid "Responsible"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:553
+#: code:addons/gamification/models/challenge.py:561
#, python-format
msgid "Retrieving progress for personal challenge without user information"
msgstr ""
@@ -1517,7 +1517,7 @@ msgid "The action that will be called to update the goal value."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:739
+#: code:addons/gamification/models/challenge.py:750
#, python-format
msgid "The challenge %s is finished."
msgstr ""
@@ -1713,7 +1713,7 @@ msgid "Update"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:487
+#: code:addons/gamification/models/goal.py:491
#, python-format
msgid "Update %s"
msgstr ""
@@ -1742,7 +1742,7 @@ msgstr ""
#: code:addons/gamification/models/badge.py:240
#: code:addons/gamification/models/badge.py:242
#: code:addons/gamification/models/badge.py:244
-#: code:addons/gamification/wizard/grant_badge.py:44
+#: code:addons/gamification/wizard/grant_badge.py:43
#, python-format
msgid "Warning!"
msgstr ""
@@ -1781,7 +1781,7 @@ msgid "You are not in the user allowed list."
msgstr ""
#. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:44
+#: code:addons/gamification/wizard/grant_badge.py:43
#, python-format
msgid "You can not grant a badge to yourself"
msgstr ""
@@ -1846,6 +1846,13 @@ msgstr ""
msgid "more details..."
msgstr ""
+#. module: gamification
+#: view:gamification.badge.user.wizard:gamification.view_badge_wizard_grant
+#: view:gamification.challenge:gamification.view_challenge_wizard
+#: view:gamification.goal.wizard:gamification.view_goal_wizard_update_current
+msgid "or"
+msgstr ""
+
#. module: gamification
#: view:gamification.goal:gamification.goal_form_view
msgid "refresh"
diff --git a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
index 3659691f19c..4b3174d21ed 100644
--- a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
+++ b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/google_account/i18n/google_account.pot b/addons/google_account/i18n/google_account.pot
index 5c8e7f1e716..a7e5dd67fb5 100644
--- a/addons/google_account/i18n/google_account.pot
+++ b/addons/google_account/i18n/google_account.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/google_calendar/i18n/google_calendar.pot b/addons/google_calendar/i18n/google_calendar.pot
index 68a9a8ce21c..defb23307fc 100644
--- a/addons/google_calendar/i18n/google_calendar.pot
+++ b/addons/google_calendar/i18n/google_calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -242,11 +242,6 @@ msgstr ""
msgid "Refresh Token"
msgstr ""
-#. module: google_calendar
-#: view:base.config.settings:google_calendar.view_calendar_config_settings
-msgid "Remark : You can, if you want, personalize the consent screen that your users will see by clicking on"
-msgstr ""
-
#. module: google_calendar
#: view:base.config.settings:google_calendar.view_calendar_config_settings
msgid "Return at Top"
@@ -278,6 +273,11 @@ msgstr ""
msgid "The account you are trying to synchronize (%s) is not the same as the last one used (%s)!"
msgstr ""
+#. module: google_calendar
+#: view:base.config.settings:google_calendar.view_calendar_config_settings
+msgid "To finish, you just need to create a \"consent screen\" by clicking on"
+msgstr ""
+
#. module: google_calendar
#: view:base.config.settings:google_calendar.view_calendar_config_settings
msgid "To setup the signin process with Google, first you have to perform the following steps"
diff --git a/addons/google_drive/i18n/google_drive.pot b/addons/google_drive/i18n/google_drive.pot
index 987b27fe924..a9f955662b0 100644
--- a/addons/google_drive/i18n/google_drive.pot
+++ b/addons/google_drive/i18n/google_drive.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
index 8e05ee9233e..f4f3dfdeb9d 100644
--- a/addons/google_spreadsheet/i18n/google_spreadsheet.pot
+++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index d62ce6c23a9..b2b5a26da4a 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -987,3 +987,8 @@ msgstr ""
msgid "no_of_recruitment"
msgstr ""
+#. module: hr
+#: view:hr.config.settings:hr.view_human_resources_configuration
+msgid "or"
+msgstr ""
+
diff --git a/addons/hr_applicant_document/i18n/hr_applicant_document.pot b/addons/hr_applicant_document/i18n/hr_applicant_document.pot
index d649df37914..fdf006fdc77 100644
--- a/addons/hr_applicant_document/i18n/hr_applicant_document.pot
+++ b/addons/hr_applicant_document/i18n/hr_applicant_document.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 1637512c3c6..96d7c71f673 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -380,3 +380,8 @@ msgid "You tried to %s with a date anterior to another event !\n"
"Try to contact the HR Manager to correct attendances."
msgstr ""
+#. module: hr_attendance
+#: view:hr.attendance.error:hr_attendance.view_hr_attendance_error
+msgid "or"
+msgstr ""
+
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index d9fd252258c..d358b88ab16 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index ccb58a4e4c0..adf7da767b8 100644
--- a/addons/hr_evaluation/i18n/hr_evaluation.pot
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1389,7 +1389,7 @@ msgstr ""
#. module: hr_evaluation
#: code:addons/hr_evaluation/hr_evaluation.py:239
-#: code:addons/hr_evaluation/hr_evaluation.py:338
+#: code:addons/hr_evaluation/hr_evaluation.py:339
#, python-format
msgid "Warning!"
msgstr ""
@@ -1423,7 +1423,7 @@ msgid "You cannot change state, because some appraisal forms have not been compl
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:338
+#: code:addons/hr_evaluation/hr_evaluation.py:339
#, python-format
msgid "You cannot start evaluation without Appraisal."
msgstr ""
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index a6f4a28d28f..2b1fb55491e 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -284,8 +284,8 @@ msgstr ""
#: code:addons/hr_expense/hr_expense.py:167
#: code:addons/hr_expense/hr_expense.py:230
#: code:addons/hr_expense/hr_expense.py:232
-#: code:addons/hr_expense/hr_expense.py:341
-#: code:addons/hr_expense/hr_expense.py:345
+#: code:addons/hr_expense/hr_expense.py:344
+#: code:addons/hr_expense/hr_expense.py:348
#, python-format
msgid "Error!"
msgstr ""
@@ -298,7 +298,7 @@ msgid "Expense"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:370
+#: code:addons/hr_expense/hr_expense.py:373
#, python-format
msgid "Expense Account Move"
msgstr ""
@@ -529,7 +529,7 @@ msgid "No expense journal found. Please make sure you have a journal with type '
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:341
+#: code:addons/hr_expense/hr_expense.py:344
#, python-format
msgid "No purchase account found for the product %s (or for his category), please configure one."
msgstr ""
@@ -555,7 +555,7 @@ msgid "Paid"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:345
+#: code:addons/hr_expense/hr_expense.py:348
#, python-format
msgid "Please configure Default Expense account for Product purchase: `property_account_expense_categ`."
msgstr ""
@@ -625,7 +625,7 @@ msgid "Review Your Expenses Products"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:443
+#: code:addons/hr_expense/hr_expense.py:446
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure"
msgstr ""
@@ -779,7 +779,7 @@ msgid "Waiting confirmation"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:443
+#: code:addons/hr_expense/hr_expense.py:446
#, python-format
msgid "Warning"
msgstr ""
diff --git a/addons/hr_gamification/i18n/hr_gamification.pot b/addons/hr_gamification/i18n/hr_gamification.pot
index 807993edf5e..b3a2a9a8f65 100644
--- a/addons/hr_gamification/i18n/hr_gamification.pot
+++ b/addons/hr_gamification/i18n/hr_gamification.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -174,6 +174,11 @@ msgstr ""
msgid "You can send badges only to employees linked to a user."
msgstr ""
+#. module: hr_gamification
+#: view:gamification.badge.user.wizard:hr_gamification.view_badge_wizard_reward
+msgid "or"
+msgstr ""
+
#. module: hr_gamification
#: view:hr.employee:hr_gamification.hr_hr_employee_view_form
msgid "to reward this employee for a good action"
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index bab4cee7712..3c75b880cbd 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -87,7 +87,7 @@ msgid "Allocation Requests to Approve"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:507
+#: code:addons/hr_holidays/hr_holidays.py:508
#, python-format
msgid "Allocation for %s"
msgstr ""
@@ -432,7 +432,7 @@ msgid "Leave Meetings"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:373
+#: code:addons/hr_holidays/hr_holidays.py:374
#: view:hr.holidays:hr_holidays.edit_holiday_new
#: view:hr.holidays:hr_holidays.view_holiday_new_calendar
#: selection:hr.holidays,type:0
@@ -530,7 +530,7 @@ msgstr ""
#. module: hr_holidays
#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
-msgid "Legal Leaves 2014"
+msgid "Legal Leaves 2015"
msgstr ""
#. module: hr_holidays
@@ -734,7 +734,7 @@ msgid "Request approved"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:472
+#: code:addons/hr_holidays/hr_holidays.py:473
#, python-format
msgid "Request approved, waiting second validation."
msgstr ""
@@ -822,7 +822,7 @@ msgid "The employee or employee category of this request is missing. Please make
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:502
+#: code:addons/hr_holidays/hr_holidays.py:503
#, python-format
msgid "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
"You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \\ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field."
@@ -839,15 +839,15 @@ msgid "The number of remaining leaves is not sufficient for this leave type"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:452
+#: code:addons/hr_holidays/hr_holidays.py:453
#, python-format
msgid "The number of remaining leaves is not sufficient for this leave type.\n"
"Please verify also the leaves waiting for validation."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:285
-#: code:addons/hr_holidays/hr_holidays.py:310
+#: code:addons/hr_holidays/hr_holidays.py:286
+#: code:addons/hr_holidays/hr_holidays.py:311
#: sql_constraint:hr.holidays:0
#, python-format
msgid "The start date must be anterior to the end date."
@@ -975,13 +975,13 @@ msgid "Waiting Second Approval"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:274
-#: code:addons/hr_holidays/hr_holidays.py:285
-#: code:addons/hr_holidays/hr_holidays.py:310
-#: code:addons/hr_holidays/hr_holidays.py:329
-#: code:addons/hr_holidays/hr_holidays.py:334
-#: code:addons/hr_holidays/hr_holidays.py:502
-#: code:addons/hr_holidays/hr_holidays.py:509
+#: code:addons/hr_holidays/hr_holidays.py:275
+#: code:addons/hr_holidays/hr_holidays.py:286
+#: code:addons/hr_holidays/hr_holidays.py:311
+#: code:addons/hr_holidays/hr_holidays.py:330
+#: code:addons/hr_holidays/hr_holidays.py:335
+#: code:addons/hr_holidays/hr_holidays.py:503
+#: code:addons/hr_holidays/hr_holidays.py:510
#, python-format
msgid "Warning!"
msgstr ""
@@ -1007,20 +1007,20 @@ msgid "You can not have 2 leaves that overlaps on same day!"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:275
#, python-format
msgid "You cannot delete a leave which is in %s state."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:509
+#: code:addons/hr_holidays/hr_holidays.py:510
#, python-format
msgid "You cannot reduce validated allocation requests"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:329
-#: code:addons/hr_holidays/hr_holidays.py:334
+#: code:addons/hr_holidays/hr_holidays.py:330
+#: code:addons/hr_holidays/hr_holidays.py:335
#, python-format
msgid "You cannot set a leave request as '%s'. Contact a human resource manager."
msgstr ""
@@ -1047,6 +1047,12 @@ msgstr ""
msgid "of the"
msgstr ""
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:hr_holidays.view_hr_holidays_summary_dept
+#: view:hr.holidays.summary.employee:hr_holidays.view_hr_holidays_summary_employee
+msgid "or"
+msgstr ""
+
#. module: hr_holidays
#: xsl:holidays.summary:0
msgid "to"
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index 2b0a2fea403..08e1704a043 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1281,6 +1281,11 @@ msgstr ""
msgid "You must select employee(s) to generate payslip(s)."
msgstr ""
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:hr_payroll.view_payslip_lines_contribution_register
+msgid "or"
+msgstr ""
+
#. module: hr_payroll
#: help:hr.payslip.line,amount_percentage_base:0
#: help:hr.salary.rule,amount_percentage_base:0
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 9db18c7b00f..4d8b2a31296 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgid "Accounting Entry"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:152
-#: code:addons/hr_payroll_account/hr_payroll_account.py:168
+#: code:addons/hr_payroll_account/hr_payroll_account.py:154
+#: code:addons/hr_payroll_account/hr_payroll_account.py:170
#, python-format
msgid "Adjustment Entry"
msgstr ""
@@ -40,8 +40,8 @@ msgid "Analytic Account"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:150
-#: code:addons/hr_payroll_account/hr_payroll_account.py:166
+#: code:addons/hr_payroll_account/hr_payroll_account.py:152
+#: code:addons/hr_payroll_account/hr_payroll_account.py:168
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -105,13 +105,13 @@ msgid "Tax Code"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:150
+#: code:addons/hr_payroll_account/hr_payroll_account.py:152
#, python-format
msgid "The Expense Journal \"%s\" has not properly configured the Credit Account!"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:166
+#: code:addons/hr_payroll_account/hr_payroll_account.py:168
#, python-format
msgid "The Expense Journal \"%s\" has not properly configured the Debit Account!"
msgstr ""
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 953d350e5ee..9a70b09c6ec 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -421,14 +421,14 @@ msgid "Company Website"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:377
+#: code:addons/hr_recruitment/hr_recruitment.py:381
#: field:hr.applicant,partner_id:0
#, python-format
msgid "Contact"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:379
+#: code:addons/hr_recruitment/hr_recruitment.py:383
#, python-format
msgid "Contact Email"
msgstr ""
@@ -1038,7 +1038,7 @@ msgid "New Applicant"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
+#: code:addons/hr_recruitment/hr_recruitment.py:508
#, python-format
msgid "New Employee %s Hired"
msgstr ""
@@ -1049,8 +1049,8 @@ msgid "New Mail"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:421
-#: code:addons/hr_recruitment/hr_recruitment.py:449
+#: code:addons/hr_recruitment/hr_recruitment.py:425
+#: code:addons/hr_recruitment/hr_recruitment.py:453
#, python-format
msgid "New application from %s"
msgstr ""
@@ -1071,7 +1071,7 @@ msgid "Next Actions"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:391
+#: code:addons/hr_recruitment/hr_recruitment.py:395
#, python-format
msgid "No Subject"
msgstr ""
@@ -1515,7 +1515,7 @@ msgid "Very important"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:507
+#: code:addons/hr_recruitment/hr_recruitment.py:511
#, python-format
msgid "Warning!"
msgstr ""
@@ -1551,7 +1551,7 @@ msgid "Word of Mouth"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:507
+#: code:addons/hr_recruitment/hr_recruitment.py:511
#, python-format
msgid "You must define an Applied Job and a Contact Name for this applicant."
msgstr ""
@@ -1567,7 +1567,7 @@ msgid "e.g. Call for interview"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:520
+#: code:addons/hr_recruitment/hr_recruitment.py:524
#, python-format
msgid "job applicants"
msgstr ""
@@ -1577,3 +1577,8 @@ msgstr ""
msgid "oe_kanban_text_red"
msgstr ""
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:hr_recruitment.view_hr_recruitment_partner_create
+msgid "or"
+msgstr ""
+
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index 63beca47c0f..642528e4ffb 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -103,6 +103,12 @@ msgstr ""
msgid "Change Work"
msgstr ""
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid "Changing the date will let this entry appear in the timesheet of the new date."
+msgstr ""
+
#. module: hr_timesheet
#: help:account.analytic.account,use_timesheets:0
msgid "Check this field if this project manages timesheets"
@@ -482,6 +488,12 @@ msgstr ""
msgid "User"
msgstr ""
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:176
+#, python-format
+msgid "User Alert!"
+msgstr ""
+
#. module: hr_timesheet
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:131
@@ -522,3 +534,10 @@ msgstr ""
msgid "month"
msgstr ""
+#. module: hr_timesheet
+#: view:hr.sign.in.project:hr_timesheet.view_hr_timesheet_sign_in
+#: view:hr.sign.in.project:hr_timesheet.view_hr_timesheet_sign_in_message
+#: view:hr.sign.out.project:hr_timesheet.view_hr_timesheet_sign_out
+msgid "or"
+msgstr ""
+
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index c50a1184030..a02b0d5e2cf 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -971,3 +971,10 @@ msgstr ""
msgid "You usually invoice 100% of the timesheets. But if you mix fixed price and timesheet invoicing, you may use another ratio. For instance, if you do a 20% advance invoice (fixed price, based on a sales order), you should invoice the rest on timesheet with a 80% ratio."
msgstr ""
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:hr_timesheet_invoice.view_hr_timesheet_analytic_profit
+#: view:hr.timesheet.invoice.create:hr_timesheet_invoice.view_hr_timesheet_invoice_create
+#: view:hr.timesheet.invoice.create.final:hr_timesheet_invoice.view_hr_timesheet_invoice_create_final
+msgid "or"
+msgstr ""
+
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index f9866d3da64..2662c175869 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -810,3 +810,13 @@ msgid "You will be able to register your working hours and\n"
" activities."
msgstr ""
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:hr_timesheet_sheet.view_hr_timesheet_current_open
+msgid "or"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:hr_timesheet_sheet.hr_timesheet_sheet_form
+msgid "to"
+msgstr ""
+
diff --git a/addons/im_chat/i18n/im_chat.pot b/addons/im_chat/i18n/im_chat.pot
index b8ac48b1073..03b8d84311c 100644
--- a/addons/im_chat/i18n/im_chat.pot
+++ b/addons/im_chat/i18n/im_chat.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot
index ddf07fa73f8..5da97856898 100644
--- a/addons/im_livechat/i18n/im_livechat.pot
+++ b/addons/im_livechat/i18n/im_livechat.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/im_odoo_support/i18n/im_odoo_support.pot b/addons/im_odoo_support/i18n/im_odoo_support.pot
new file mode 100644
index 00000000000..c757d1ab812
--- /dev/null
+++ b/addons/im_odoo_support/i18n/im_odoo_support.pot
@@ -0,0 +1,40 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * im_odoo_support
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: im_odoo_support
+#. openerp-web
+#: code:addons/im_odoo_support/static/src/js/im_odoo_support.js:70
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: im_odoo_support
+#. openerp-web
+#: code:addons/im_odoo_support/static/src/js/im_odoo_support.js:109
+#: code:addons/im_odoo_support/static/src/js/im_odoo_support.js:123
+#: code:addons/im_odoo_support/static/src/xml/im_odoo_support.xml:7
+#, python-format
+msgid "Odoo Support"
+msgstr ""
+
+#. module: im_odoo_support
+#. openerp-web
+#: code:addons/im_odoo_support/static/src/js/im_odoo_support.js:70
+#, python-format
+msgid "The connection with the Odoo Support Server failed. Please retry in a few minutes, or send an email to support@odoo.com ."
+msgstr ""
+
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index c17970e5fe0..15cf09c4c36 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -93,3 +93,8 @@ msgstr ""
msgid "Manage documents"
msgstr ""
+#. module: knowledge
+#: view:knowledge.config.settings:knowledge.view_knowledge_configuration
+msgid "or"
+msgstr ""
+
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index 93c794c2f4b..dce59303509 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -927,6 +927,13 @@ msgstr ""
msgid "lunch validation for order"
msgstr ""
+#. module: lunch
+#: view:lunch.cancel:lunch.cancel_order_lines_view
+#: view:lunch.order.order:lunch.order_order_lines_view
+#: view:lunch.validation:lunch.validate_order_lines_view
+msgid "or"
+msgstr ""
+
#. module: lunch
#: field:lunch.order.line,name:0
msgid "unknown"
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 869c12ad571..10384aa4462 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -256,7 +256,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:101
+#: code:addons/mail/static/src/js/mail_followers.js:102
#, python-format
msgid "Apply"
msgstr ""
@@ -353,7 +353,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:105
+#: code:addons/mail/static/src/js/mail_followers.js:106
#: view:mail.compose.message:mail.email_compose_message_wizard_form
#: view:mail.mail:mail.view_mail_form
#: view:mail.wizard.invite:mail.mail_wizard_invite_form
@@ -396,7 +396,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail.js:1970
+#: code:addons/mail/static/src/js/mail.js:1980
#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
#: view:mail.compose.message:mail.email_compose_message_wizard_form
#, python-format
@@ -544,7 +544,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail.js:1021
+#: code:addons/mail/static/src/js/mail.js:1035
#, python-format
msgid "Do you really want to delete this message?"
msgstr ""
@@ -563,7 +563,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:99
+#: code:addons/mail/static/src/js/mail_followers.js:100
#, python-format
msgid "Edit Subscription of "
msgstr ""
@@ -982,7 +982,7 @@ msgid "Log an internal note"
msgstr ""
#. module: mail
-#: code:addons/mail/mail_mail.py:330
+#: code:addons/mail/mail_mail.py:340
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
@@ -1185,7 +1185,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:184
+#: code:addons/mail/static/src/js/mail_followers.js:205
#, python-format
msgid "No followers"
msgstr ""
@@ -1236,7 +1236,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:186
+#: code:addons/mail/static/src/js/mail_followers.js:207
#, python-format
msgid "One follower"
msgstr ""
@@ -1363,7 +1363,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail.js:611
+#: code:addons/mail/static/src/js/mail.js:621
#, python-format
msgid "Please complete partner's informations"
msgstr ""
@@ -1419,7 +1419,7 @@ msgid "R&D"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:188
+#: code:addons/mail/wizard/mail_compose_message.py:191
#, python-format
msgid "Re:"
msgstr ""
@@ -1889,7 +1889,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:140
+#: code:addons/mail/static/src/js/mail_followers.js:141
#, python-format
msgid "Warning! \n"
" %s won't be notified of any email or discussion on this document. Do you really want to remove him from the followers ?"
@@ -1897,7 +1897,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:309
+#: code:addons/mail/static/src/js/mail_followers.js:330
#, python-format
msgid "Warning! \n"
"You won't be notified of any email or discussion on this document. Do you really want to unfollow this document ?"
@@ -1913,6 +1913,15 @@ msgstr ""
msgid "Whole Company"
msgstr ""
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:374
+#, python-format
+msgid "You are currently composing a message, your message will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr ""
+
#. module: mail
#: code:addons/mail/res_users.py:74
#, python-format
@@ -1958,6 +1967,11 @@ msgstr ""
msgid "and"
msgstr ""
+#. module: mail
+#: view:mail.mail:mail.view_mail_form
+msgid "by"
+msgstr ""
+
#. module: mail
#: code:addons/mail/mail_thread.py:115
#, python-format
@@ -1966,7 +1980,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:188
+#: code:addons/mail/static/src/js/mail_followers.js:209
#, python-format
msgid "followers"
msgstr ""
@@ -2018,9 +2032,17 @@ msgstr ""
msgid "notified"
msgstr ""
+#. module: mail
+#: view:mail.compose.message:mail.email_compose_message_wizard_form
+#: view:mail.mail:mail.view_mail_form
+msgid "on"
+msgstr ""
+
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:56
+#: view:mail.compose.message:mail.email_compose_message_wizard_form
+#: view:mail.wizard.invite:mail.mail_wizard_invite_form
#, python-format
msgid "or"
msgstr ""
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index e7f58177c6f..61c4cbf384d 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -104,3 +104,8 @@ msgstr ""
msgid "User"
msgstr ""
+#. module: marketing
+#: view:marketing.config.settings:marketing.view_marketing_configuration
+msgid "or"
+msgstr ""
+
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 21575a9c80c..5ecf9965ded 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index 55489f6c36f..c1d758c0f72 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/marketing_crm/i18n/marketing_crm.pot b/addons/marketing_crm/i18n/marketing_crm.pot
index d38c151730f..d661123f726 100644
--- a/addons/marketing_crm/i18n/marketing_crm.pot
+++ b/addons/marketing_crm/i18n/marketing_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index e2b84c96af2..b89bd91118e 100644
--- a/addons/mass_mailing/i18n/mass_mailing.pot
+++ b/addons/mass_mailing/i18n/mass_mailing.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1064,6 +1064,11 @@ msgstr ""
msgid "emails are in queue and will be sent soon."
msgstr ""
+#. module: mass_mailing
+#: view:mail.mass_mailing.test:mass_mailing.view_mail_mass_mailing_test_form
+msgid "or"
+msgstr ""
+
#. module: mass_mailing
#: view:website:website.snippets
msgid "your email..."
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index fa7c713ac1f..0e22608bcbb 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -620,3 +620,8 @@ msgstr ""
msgid "Waiting Member"
msgstr ""
+#. module: membership
+#: view:membership.invoice:membership.view_membership_invoice_view
+msgid "or"
+msgstr ""
+
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 0dc1ce04f56..a98fd1296e3 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: mrp
-#: code:addons/mrp/stock.py:260
+#: code:addons/mrp/stock.py:262
#, python-format
msgid " Manufacture"
msgstr ""
@@ -33,13 +33,13 @@ msgid "# Manufacturing Orders"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:356
+#: code:addons/mrp/mrp.py:323
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:958
+#: code:addons/mrp/mrp.py:977
#, python-format
msgid "%s produced"
msgstr ""
@@ -278,6 +278,11 @@ msgstr ""
msgid "BOM Structure"
msgstr ""
+#. module: mrp
+#: field:mrp.bom.line,child_line_ids:0
+msgid "BOM lines of the referred bom"
+msgstr ""
+
#. module: mrp
#: code:addons/mrp/stock.py:44
#, python-format
@@ -309,7 +314,7 @@ msgstr ""
#: model:ir.actions.act_window,name:mrp.product_open_bom
#: model:ir.actions.act_window,name:mrp.template_open_bom
#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
-#: view:mrp.bom:mrp.mrp_bom_tree_view
+#: view:mrp.bom.line:mrp.mrp_bom_tree_view
#: view:product.product:mrp.product_product_form_view_bom_button
#: view:product.template:mrp.product_template_form_view_bom_button
#: field:product.template,bom_ids:0
@@ -332,20 +337,15 @@ msgid "BoM"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:322
+#: code:addons/mrp/mrp.py:289
#, python-format
msgid "BoM \"%s\" contains a BoM line with a product recursion: \"%s\"."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:348
+#: code:addons/mrp/mrp.py:315
#, python-format
-msgid "BoM \"%s\" contains a phantom BoM line but the product \"%s\" don't have any BoM defined."
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-msgid "BoM Hierarchy"
+msgid "BoM \"%s\" contains a phantom BoM line but the product \"%s\" does not have any BoM defined."
msgstr ""
#. module: mrp
@@ -364,7 +364,7 @@ msgid "BoM Type"
msgstr ""
#. module: mrp
-#: code:addons/mrp/stock.py:257
+#: code:addons/mrp/stock.py:259
#, python-format
msgid "Can't find any generic Manufacture route."
msgstr ""
@@ -390,19 +390,19 @@ msgid "Cancelled"
msgstr ""
#. module: mrp
-#: code:addons/mrp/stock.py:182
+#: code:addons/mrp/stock.py:183
#, python-format
msgid "Cannot consume a move with negative or zero quantity."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:617
+#: code:addons/mrp/mrp.py:605
#, python-format
msgid "Cannot delete a manufacturing order in state '%s'."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:704
+#: code:addons/mrp/mrp.py:679
#, python-format
msgid "Cannot find a bill of material for this product."
msgstr ""
@@ -692,9 +692,9 @@ msgid "End Date"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:704
-#: code:addons/mrp/stock.py:182
-#: code:addons/mrp/stock.py:257
+#: code:addons/mrp/mrp.py:679
+#: code:addons/mrp/stock.py:183
+#: code:addons/mrp/stock.py:259
#: code:addons/mrp/wizard/change_production_qty.py:83
#: code:addons/mrp/wizard/change_production_qty.py:88
#, python-format
@@ -869,9 +869,9 @@ msgid "Internal Reference"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:322
-#: code:addons/mrp/mrp.py:348
-#: code:addons/mrp/mrp.py:617
+#: code:addons/mrp/mrp.py:289
+#: code:addons/mrp/mrp.py:315
+#: code:addons/mrp/mrp.py:605
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -985,8 +985,8 @@ msgid "Manager"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:32
-#: code:addons/mrp/stock.py:254
+#: code:addons/mrp/procurement.py:33
+#: code:addons/mrp/stock.py:256
#, python-format
msgid "Manufacture"
msgstr ""
@@ -1031,7 +1031,7 @@ msgid "Manufacturing Order"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:124
+#: code:addons/mrp/procurement.py:131
#, python-format
msgid "Manufacturing Order %s created."
msgstr ""
@@ -1134,7 +1134,7 @@ msgid "New"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:120
+#: code:addons/mrp/procurement.py:127
#, python-format
msgid "No BoM exists for this product!"
msgstr ""
@@ -1347,11 +1347,6 @@ msgstr ""
msgid "Product Move"
msgstr ""
-#. module: mrp
-#: view:website:mrp.report_mrpbomstructure
-msgid "Product Name"
-msgstr ""
-
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_product_price
msgid "Product Price"
@@ -1875,8 +1870,8 @@ msgid "Technical field used to make the traceability of produced products"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:366
-#: code:addons/mrp/mrp.py:433
+#: code:addons/mrp/mrp.py:333
+#: code:addons/mrp/mrp.py:421
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
@@ -2089,13 +2084,14 @@ msgid "Warehouse"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:366
-#: code:addons/mrp/mrp.py:433
+#: code:addons/mrp/mrp.py:333
+#: code:addons/mrp/mrp.py:421
#, python-format
msgid "Warning"
msgstr ""
#. module: mrp
+#: code:addons/mrp/mrp.py:339
#: code:addons/mrp/stock.py:42
#: code:addons/mrp/stock.py:44
#: code:addons/mrp/stock.py:169
@@ -2258,6 +2254,13 @@ msgid "You can configure by-products in the bill of material.\n"
"-This installs the module mrp_byproduct."
msgstr ""
+#. module: mrp
+#: code:addons/mrp/mrp.py:339
+#, python-format
+msgid "You can not delete a Bill of Material with running manufacturing orders.\n"
+"Please close or cancel it first."
+msgstr ""
+
#. module: mrp
#: code:addons/mrp/stock.py:42
#, python-format
@@ -2279,6 +2282,16 @@ msgstr ""
msgid "min"
msgstr ""
+#. module: mrp
+#: view:change.production.qty:mrp.view_change_production_qty_wizard
+#: view:mrp.config.settings:mrp.view_mrp_config
+#: view:mrp.product.produce:mrp.view_mrp_product_produce_wizard
+#: view:mrp.product_price:mrp.view_mrp_product_price_wizard
+#: view:mrp.workcenter.load:mrp.view_mrp_workcenter_load_wizard
+#: view:stock.move.consume:mrp.view_stock_move_consume_wizard
+msgid "or"
+msgstr ""
+
#. module: mrp
#: selection:mrp.property,composition:0
msgid "plus"
diff --git a/addons/mrp_byproduct/i18n/mrp_byproduct.pot b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
index 9d1e913f7e3..16756ed107a 100644
--- a/addons/mrp_byproduct/i18n/mrp_byproduct.pot
+++ b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index 64f1918a588..61f3e67eb88 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -172,10 +172,10 @@ msgstr ""
#. module: mrp_operations
#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:446
-#: code:addons/mrp_operations/mrp_operations.py:450
-#: code:addons/mrp_operations/mrp_operations.py:462
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:445
+#: code:addons/mrp_operations/mrp_operations.py:449
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:464
#, python-format
msgid "Error!"
msgstr ""
@@ -235,19 +235,19 @@ msgid "In Progress"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:455
+#: code:addons/mrp_operations/mrp_operations.py:454
#, python-format
msgid "In order to Finish the operation, it must be in the Start or Resume state!"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:446
+#: code:addons/mrp_operations/mrp_operations.py:445
#, python-format
msgid "In order to Pause the operation, it must be in the Start or Resume state!"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:449
#, python-format
msgid "In order to Resume the operation, it must be in the Pause state!"
msgstr ""
@@ -291,7 +291,7 @@ msgid "Month Planned"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:462
+#: code:addons/mrp_operations/mrp_operations.py:461
#, python-format
msgid "No operation to cancel."
msgstr ""
@@ -307,25 +307,25 @@ msgid "Operation Name"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:442
+#: code:addons/mrp_operations/mrp_operations.py:441
#, python-format
msgid "Operation has already started! You can either Pause/Finish/Cancel the operation."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:458
+#: code:addons/mrp_operations/mrp_operations.py:457
#, python-format
msgid "Operation is Already Cancelled!"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:464
#, python-format
msgid "Operation is already finished!"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:435
+#: code:addons/mrp_operations/mrp_operations.py:434
#, python-format
msgid "Operation is not started yet!"
msgstr ""
@@ -489,10 +489,10 @@ msgid "Set to Draft"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:435
-#: code:addons/mrp_operations/mrp_operations.py:442
-#: code:addons/mrp_operations/mrp_operations.py:455
-#: code:addons/mrp_operations/mrp_operations.py:458
+#: code:addons/mrp_operations/mrp_operations.py:434
+#: code:addons/mrp_operations/mrp_operations.py:441
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:457
#, python-format
msgid "Sorry!"
msgstr ""
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 400facf2f0e..dc33698ec17 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -890,6 +890,12 @@ msgid "You have to select a pricelist in the Repair form !\n"
"Please set one before choosing a product."
msgstr ""
+#. module: mrp_repair
+#: view:mrp.repair.cancel:mrp_repair.view_cancel_repair
+#: view:mrp.repair.make_invoice:mrp_repair.view_make_invoice
+msgid "or"
+msgstr ""
+
#. module: mrp_repair
#: field:mrp.repair,default_address_id:0
msgid "unknown"
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index 786aa7406ff..96dcd1917e1 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index 223fcbba7f7..6c43206b4ca 100644
--- a/addons/note/i18n/note.pot
+++ b/addons/note/i18n/note.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/note_pad/i18n/note_pad.pot b/addons/note_pad/i18n/note_pad.pot
index 487a99a6188..351fba85d76 100644
--- a/addons/note_pad/i18n/note_pad.pot
+++ b/addons/note_pad/i18n/note_pad.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index 55888466b46..9828e79f574 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid "Created on"
msgstr ""
#. module: pad
-#: code:addons/pad/pad.py:50
+#: code:addons/pad/pad.py:52
#, python-format
msgid "Error"
msgstr ""
@@ -72,7 +72,7 @@ msgid "Pad Server"
msgstr ""
#. module: pad
-#: code:addons/pad/pad.py:50
+#: code:addons/pad/pad.py:52
#, python-format
msgid "Pad creation failed, either there is a problem with your pad server URL or with your connection."
msgstr ""
@@ -84,14 +84,14 @@ msgstr ""
#. module: pad
#. openerp-web
-#: code:addons/pad/static/src/js/pad.js:48
+#: code:addons/pad/static/src/js/pad.js:49
#, python-format
msgid "This pad will be initialized on first edit"
msgstr ""
#. module: pad
#. openerp-web
-#: code:addons/pad/static/src/js/pad.js:45
+#: code:addons/pad/static/src/js/pad.js:46
#, python-format
msgid "Unable to load pad"
msgstr ""
diff --git a/addons/pad_project/i18n/pad_project.pot b/addons/pad_project/i18n/pad_project.pot
index 10636e044f5..faf75e0f479 100644
--- a/addons/pad_project/i18n/pad_project.pot
+++ b/addons/pad_project/i18n/pad_project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index 62f175e0e4a..27aa7e3c018 100644
--- a/addons/payment/i18n/payment.pot
+++ b/addons/payment/i18n/payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -312,7 +312,7 @@ msgid "Partner Reference"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:273
+#: code:addons/payment/models/payment_acquirer.py:274
#, python-format
msgid "Pay safely online"
msgstr ""
diff --git a/addons/payment_adyen/i18n/payment_adyen.pot b/addons/payment_adyen/i18n/payment_adyen.pot
index ac2aedefc83..c770977ae60 100644
--- a/addons/payment_adyen/i18n/payment_adyen.pot
+++ b/addons/payment_adyen/i18n/payment_adyen.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: payment_adyen
+#: model:payment.acquirer,pre_msg:payment_adyen.payment_acquirer_adyen
+msgid "
\n"
+" A great Keyboard. Cordless.
\n"
+" Design. The thinnest iPod ever.
\n"
+" Music. It's what beats inside.
\n"
+" How to get your groove on.
\n"
+" Genius. Your own personal DJ.
\n"
+" Playlists. The perfect mix for every mood.
\n"
+" Sync to your heart’s content.
\n"
+" When one playlist isn’t enough.
\n"
+" Have Genius call the tunes.
\n"
+" Ultrathin design
\n"
+" The desktop. In its most advanced form ever
\n"
+" Beautiful widescreen display.
\n"
+" Brilliance onscreen. And behind it.
\n"
+" Key Features
\n"
+" The full iPad experience.
\n"
+" There's less of it, but no less to it.
\n"
+" Beautiful 7.9‑inch display.
\n"
+" A screen worthy of iPad.
\n"
+" Over 375,000 apps.
\n"
+" If it's made for iPad, it's made for iPad mini.
\n"
+" Why you'll love an iPad.
\n"
+" Ultrafast wireless.
\n"
+" Fast connections.The world over.
\n"
+" Why you'll love an iPad.
\n"
+" The full iPad experience.
\n"
+" There is less of it, but no less to it.
\n"
+" Bose Mini Bluetooth Speaker.
\n"
+" Characteristics
\n"
+" \n"
+"
\n"
+" Plays where you play
\n"
+" Bluetooth connectivity
\n"
+" More features.
\n"
+" Two is better than one.
\n"
+" Hear, hear.
\n"
+" Keep it clean.
\n"
+" \n"
" \n"
-" It would be very difficult to cover all of the possibilities of OpenERP and I believe the major aspects were covered very well \n"
+" It would be very difficult to cover all of the possibilities of Odoo and I believe the major aspects were covered very well \n"
" \n"
" \n"
" The trainer has a very good knowledge of the subject, he understands the issues of the trainees very fast and provided answers with the right level of illustration.\n"
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 63eb7861207..2940461e526 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product_extended/i18n/product_extended.pot b/addons/product_extended/i18n/product_extended.pot
index a4444b8ce92..f8350f2cd29 100644
--- a/addons/product_extended/i18n/product_extended.pot
+++ b/addons/product_extended/i18n/product_extended.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_extended
-#: code:addons/product_extended/wizard/wizard_price.py:43
-#: code:addons/product_extended/wizard/wizard_price.py:52
+#: code:addons/product_extended/wizard/wizard_price.py:44
+#: code:addons/product_extended/wizard/wizard_price.py:56
#, python-format
msgid "Active ID is not set in Context."
msgstr ""
@@ -93,12 +93,12 @@ msgid "Last Updated on"
msgstr ""
#. module: product_extended
-#: model:ir.model,name:product_extended.model_product_product
-msgid "Product"
+#: model:ir.model,name:product_extended.model_product_template
+msgid "Product Template"
msgstr ""
#. module: product_extended
-#: view:product.product:product_extended.product_product_ext_form_view2
+#: view:product.template:product_extended.product_product_ext_form_view2
msgid "Recompute price from BoM"
msgstr ""
@@ -112,3 +112,25 @@ msgstr ""
msgid "Standard Price"
msgstr ""
+#. module: product_extended
+#: view:wizard.price:product_extended.view_compute_price_wizard
+msgid "The price is computed from the bill of material lines which are not variant specific"
+msgstr ""
+
+#. module: product_extended
+#: code:addons/product_extended/wizard/wizard_price.py:54
+#, python-format
+msgid "This wizard is build for product templates, while you are currently running it from a product variant."
+msgstr ""
+
+#. module: product_extended
+#: code:addons/product_extended/wizard/wizard_price.py:54
+#, python-format
+msgid "Wrong model!"
+msgstr ""
+
+#. module: product_extended
+#: view:wizard.price:product_extended.view_compute_price_wizard
+msgid "or"
+msgstr ""
+
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index 888858f4cf0..09e8307d1ef 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -299,3 +299,8 @@ msgstr ""
msgid "Turnover - Standard price"
msgstr ""
+#. module: product_margin
+#: view:product.margin:product_margin.product_margin_form_view
+msgid "or"
+msgstr ""
+
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index 76cb72b9fb4..d9951a33045 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 65cbcb7da02..00a578afba3 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -391,6 +391,7 @@ msgid "Cumulative Flow"
msgstr ""
#. module: project
+#: view:project.project:project.edit_project
#: field:project.task,partner_id:0
msgid "Customer"
msgstr ""
@@ -751,6 +752,12 @@ msgstr ""
msgid "Internal email associated with this project. Incoming emails are automatically synchronizedwith Tasks (or optionally Issues if the Issue Tracker module is installed)."
msgstr ""
+#. module: project
+#: code:addons/project/project.py:201
+#, python-format
+msgid "Internal project: all employees can access"
+msgstr ""
+
#. module: project
#: code:addons/project/project.py:171
#, python-format
@@ -1068,6 +1075,12 @@ msgstr ""
msgid "Privacy / Visibility"
msgstr ""
+#. module: project
+#: code:addons/project/project.py:202
+#, python-format
+msgid "Private project: followers Only"
+msgstr ""
+
#. module: project
#: field:project.project,progress_rate:0
#: field:report.project.task.user,progress:0
@@ -1186,6 +1199,12 @@ msgid "Provides timesheet support for the issues/bugs management in project.\n"
"-This installs the module project_issue_sheet."
msgstr ""
+#. module: project
+#: code:addons/project/project.py:200
+#, python-format
+msgid "Public project"
+msgstr ""
+
#. module: project
#: view:project.project:project.edit_project
msgid "Re-open project"
@@ -1314,6 +1333,11 @@ msgstr ""
msgid "Stages common to all projects"
msgstr ""
+#. module: project
+#: view:project.project:project.edit_project
+msgid "Start Date"
+msgstr ""
+
#. module: project
#: field:project.task,date_start:0
msgid "Starting Date"
@@ -1646,6 +1670,11 @@ msgstr ""
msgid "Usability"
msgstr ""
+#. module: project
+#: view:project.project:project.edit_project
+msgid "Use Tasks"
+msgstr ""
+
#. module: project
#: field:project.config.settings,module_pad:0
msgid "Use integrated collaborative note pads on task"
@@ -1747,6 +1776,12 @@ msgstr ""
msgid "oe_kanban_text_red"
msgstr ""
+#. module: project
+#: view:project.config.settings:project.view_config_settings
+#: view:project.task.delegate:project.view_project_task_delegate
+msgid "or"
+msgstr ""
+
#. module: project
#: code:addons/project/project.py:878
#, python-format
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index bc0da7e5c2b..1b3a5a09114 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 385c520d1f8..29728cec1e5 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index a575e7df620..25baa46b1d5 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -139,13 +139,13 @@ msgid "ID"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:264
+#: code:addons/project_timesheet/project_timesheet.py:294
#, python-format
msgid "Invalid Action!"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:291
+#: code:addons/project_timesheet/project_timesheet.py:321
#, python-format
msgid "Invalid Analytic Account!"
msgstr ""
@@ -306,13 +306,13 @@ msgid "Year"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:264
+#: code:addons/project_timesheet/project_timesheet.py:294
#, python-format
msgid "You cannot delete a partner which is assigned to project, but you can uncheck the active box."
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:291
+#: code:addons/project_timesheet/project_timesheet.py:321
#, python-format
msgid "You cannot select a Analytic Account which is in Close or Cancelled state."
msgstr ""
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 45524822c36..fe49842589b 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -159,7 +159,7 @@ msgid " * The 'Draft' status is set automatically when purchase order in draft s
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:185
+#: code:addons/purchase/stock.py:198
#, python-format
msgid " Buy"
msgstr ""
@@ -269,7 +269,7 @@ msgstr ""
msgid "
\n"
@@ -413,14 +413,14 @@ msgid "Website:"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:439
+#: code:addons/report/models/report.py:450
#, python-format
msgid "Wkhtmltopdf failed (error code: %s). Message: %s"
msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:70
+#: code:addons/report/static/src/js/qwebactionmanager.js:75
#, python-format
msgid "You need to start OpenERP with at least two \n"
"workers to print a pdf version of the reports."
@@ -428,7 +428,7 @@ msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:77
+#: code:addons/report/static/src/js/qwebactionmanager.js:82
#, python-format
msgid "You should upgrade your version of\n"
" Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\n"
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index 5befe5297bd..9e369fe048e 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/report_webkit/i18n/report_webkit.pot b/addons/report_webkit/i18n/report_webkit.pot
index c48e538b92e..ed4f3003ad8 100644
--- a/addons/report_webkit/i18n/report_webkit.pot
+++ b/addons/report_webkit/i18n/report_webkit.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -508,6 +508,11 @@ msgstr ""
msgid "_Ok"
msgstr ""
+#. module: report_webkit
+#: view:report.webkit.actions:report_webkit.view_report_webkit_actions
+msgid "or"
+msgstr ""
+
#. module: report_webkit
#: field:ir.header_webkit,footer_html:0
msgid "webkit footer"
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index a1275d98a7c..12cbd219df4 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index ccf6b5c5f67..7c02c0f1bcb 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -227,7 +227,7 @@ msgid "Advance Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:203
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:207
#, python-format
msgid "Advance Invoice"
msgstr ""
@@ -238,14 +238,13 @@ msgid "Advance Product"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:107
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:62
#, python-format
msgid "Advance of %s %%"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:114
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:116
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:62
#, python-format
msgid "Advance of %s %s"
msgstr ""
@@ -376,7 +375,7 @@ msgid "Before Delivery"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1041
+#: code:addons/sale/sale.py:1048
#, python-format
msgid "Before choosing a product,\n"
" select a customer in the sales form."
@@ -433,13 +432,13 @@ msgid "Cannot cancel this sales order!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1164
+#: code:addons/sale/sale.py:1171
#, python-format
msgid "Cannot delete a sales order line which is in state '%s'."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1133
+#: code:addons/sale/sale.py:1140
#, python-format
msgid "Cannot find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
@@ -495,9 +494,9 @@ msgid "Company"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1141
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#: code:addons/sale/sale.py:1148
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:99
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -761,8 +760,8 @@ msgstr ""
#: code:addons/sale/sale.py:390
#: code:addons/sale/sale.py:522
#: code:addons/sale/sale.py:605
-#: code:addons/sale/sale.py:927
-#: code:addons/sale/sale.py:944
+#: code:addons/sale/sale.py:934
+#: code:addons/sale/sale.py:951
#, python-format
msgid "Error!"
msgstr ""
@@ -905,21 +904,21 @@ msgid "In order to delete a confirmed sales order, you must cancel it before!"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:105
#, python-format
msgid "Incorrect Data"
msgstr ""
#. module: sale
#: code:addons/sale/sale.py:274
-#: code:addons/sale/sale.py:983
-#: code:addons/sale/sale.py:1164
+#: code:addons/sale/sale.py:990
+#: code:addons/sale/sale.py:1171
#, python-format
msgid "Invalid Action!"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: code:addons/sale/wizard/sale_line_invoice.py:127
#: model:ir.model,name:sale.model_account_invoice
#: view:sale.order:sale.view_order_form
#, python-format
@@ -983,7 +982,7 @@ msgid "Invoice and shipping address:"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#, python-format
msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n"
"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
@@ -991,13 +990,13 @@ msgid "Invoice cannot be created for this Sales Order Line due to one of the fol
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:97
+#: code:addons/sale/wizard/sale_line_invoice.py:102
#, python-format
msgid "Invoice created"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1217
+#: code:addons/sale/sale.py:1224
#, python-format
msgid "Invoice paid"
msgstr ""
@@ -1121,19 +1120,19 @@ msgid "New Mail"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1041
+#: code:addons/sale/sale.py:1048
#, python-format
msgid "No Customer Defined!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1125
+#: code:addons/sale/sale.py:1132
#, python-format
msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1136
+#: code:addons/sale/sale.py:1143
#, python-format
msgid "No valid pricelist line found ! :"
msgstr ""
@@ -1271,7 +1270,7 @@ msgid "Percentage"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:928
+#: code:addons/sale/sale.py:935
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -1292,6 +1291,11 @@ msgstr ""
msgid "Price"
msgstr ""
+#. module: sale
+#: field:sale.order.line,price_reduce:0
+msgid "Price Reduce"
+msgstr ""
+
#. module: sale
#: field:sale.order,pricelist_id:0
#: field:sale.report,pricelist_id:0
@@ -1641,6 +1645,7 @@ msgstr ""
#: view:account.invoice:sale.account_invoice_groupby_inherit
#: view:account.invoice:sale.account_invoice_tree
#: field:account.invoice,section_id:0
+#: view:account.invoice.report:sale.view_account_invoice_report_search_inherit
#: field:account.invoice.report,section_id:0
#: view:sale.order:sale.view_sales_order_filter
#: field:sale.order,section_id:0
@@ -1726,7 +1731,7 @@ msgstr ""
#. module: sale
#: view:website:sale.report_saleorder_document
-msgid "Shipping address :"
+msgid "Shipping address:"
msgstr ""
#. module: sale
@@ -1817,13 +1822,13 @@ msgid "The total amount."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:103
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
#, python-format
msgid "The value of Advance Amount must be positive."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:945
+#: code:addons/sale/sale.py:952
#, python-format
msgid "There is no Fiscal Position defined or Income category account defined for default properties of Product categories."
msgstr ""
@@ -1835,13 +1840,13 @@ msgid "There is no default company for the current user!"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:93
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
#, python-format
msgid "There is no income account defined as global property."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:97
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:100
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
msgstr ""
@@ -2026,7 +2031,7 @@ msgid "Warehouse Features"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_line_invoice.py:113
#: code:addons/sale/wizard/sale_make_invoice.py:42
#: code:addons/sale/wizard/sale_make_invoice.py:55
#, python-format
@@ -2054,7 +2059,7 @@ msgid "What do you want to invoice?"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:983
+#: code:addons/sale/sale.py:990
#, python-format
msgid "You cannot cancel a sales order line that has already been invoiced."
msgstr ""
@@ -2078,7 +2083,7 @@ msgid "You cannot group sales having different currencies for the same partner."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1123
+#: code:addons/sale/sale.py:1130
#, python-format
msgid "You have to select a pricelist or a customer in the sales form !\n"
"Please set one before choosing a product."
@@ -2095,6 +2100,13 @@ msgstr ""
msgid "Your Reference:"
msgstr ""
+#. module: sale
+#: view:sale.advance.payment.inv:sale.view_sale_advance_payment_inv
+#: view:sale.make.invoice:sale.view_sale_order_make_invoice
+#: view:sale.order.line.make.invoice:sale.view_sale_order_line_make_invoice
+msgid "or"
+msgstr ""
+
#. module: sale
#: view:res.partner:sale.res_partner_address_type
msgid "sale.group_delivery_invoice_address"
diff --git a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
index d4b2c1b21b3..5b580585d5a 100644
--- a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
+++ b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 9e5bdd7ff49..0b6126a424b 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -157,3 +157,8 @@ msgstr ""
msgid "_Create"
msgstr ""
+#. module: sale_crm
+#: view:crm.make.sale:sale_crm.view_crm_make_sale
+msgid "or"
+msgstr ""
+
diff --git a/addons/sale_journal/i18n/sale_journal.pot b/addons/sale_journal/i18n/sale_journal.pot
index e66618e912f..9eb4779e73a 100644
--- a/addons/sale_journal/i18n/sale_journal.pot
+++ b/addons/sale_journal/i18n/sale_journal.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -133,6 +133,11 @@ msgstr ""
msgid "Sales Order"
msgstr ""
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
#. module: sale_journal
#: help:res.partner,property_invoice_type:0
msgid "This invoicing type will be used, by default, to invoice the current partner."
diff --git a/addons/sale_layout/i18n/sale_layout.pot b/addons/sale_layout/i18n/sale_layout.pot
index 77593cd068f..3ef11998adc 100644
--- a/addons/sale_layout/i18n/sale_layout.pot
+++ b/addons/sale_layout/i18n/sale_layout.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index e3fac500079..fbae7532342 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 40c4f0c8a26..835f332cf60 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index cb3576af7aa..4521de25ebd 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_service/i18n/sale_service.pot b/addons/sale_service/i18n/sale_service.pot
index f5b0870acd5..326974b24eb 100644
--- a/addons/sale_service/i18n/sale_service.pot
+++ b/addons/sale_service/i18n/sale_service.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -85,6 +85,6 @@ msgstr ""
#. module: sale_service
#: help:product.template,auto_create_task:0
-msgid "Thick this option if you want to create a task automatically each time this product is sold"
+msgid "Tick this option if you want to create a task automatically each time this product is sold"
msgstr ""
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index 907537485c5..32b9977a1b6 100644
--- a/addons/sale_stock/i18n/sale_stock.pot
+++ b/addons/sale_stock/i18n/sale_stock.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,7 +66,7 @@ msgstr ""
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:277
-#: code:addons/sale_stock/sale_stock.py:351
+#: code:addons/sale_stock/sale_stock.py:352
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -164,7 +164,7 @@ msgid "Margin of error for dates promised to customers. Products will be schedul
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:346
+#: code:addons/sale_stock/sale_stock.py:347
#, python-format
msgid "Not enough stock ! : "
msgstr ""
@@ -340,7 +340,7 @@ msgid "You must first cancel all delivery order(s) attached to this sales order.
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:342
+#: code:addons/sale_stock/sale_stock.py:343
#, python-format
msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
"The real stock is %.2f %s. (without reservations)"
diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot
index 430677347ba..d060fe33c52 100644
--- a/addons/sales_team/i18n/sales_team.pot
+++ b/addons/sales_team/i18n/sales_team.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index 117f475d660..7a0c90b2d51 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-23 16:28+0000\n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,19 @@ msgid "\n"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:525
+#: code:addons/share/wizard/share_wizard.py:524
#, python-format
msgid "(Copy for sharing)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:550
+#: code:addons/share/wizard/share_wizard.py:549
#, python-format
msgid "(Duplicated for modified sharing permissions)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:600
+#: code:addons/share/wizard/share_wizard.py:599
#, python-format
msgid "(Modified)"
msgstr ""
@@ -65,7 +65,7 @@ msgid "Access rights to be granted on the shared documents."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:641
+#: code:addons/share/wizard/share_wizard.py:640
#, python-format
msgid "Action and Access Mode are required to create a shared access."
msgstr ""
@@ -117,7 +117,7 @@ msgid "Configuration"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:492
+#: code:addons/share/wizard/share_wizard.py:491
#, python-format
msgid "Copied access for sharing"
msgstr ""
@@ -140,8 +140,8 @@ msgid "Current View Type"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:831
-#: code:addons/share/wizard/share_wizard.py:863
+#: code:addons/share/wizard/share_wizard.py:830
+#: code:addons/share/wizard/share_wizard.py:862
#, python-format
msgid "Database"
msgstr ""
@@ -168,8 +168,8 @@ msgid "Domain"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:814
-#: code:addons/share/wizard/share_wizard.py:845
+#: code:addons/share/wizard/share_wizard.py:813
+#: code:addons/share/wizard/share_wizard.py:844
#, python-format
msgid "Email Required"
msgstr ""
@@ -209,8 +209,8 @@ msgid "Group created to set access rights for sharing data with some users."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:822
-#: code:addons/share/wizard/share_wizard.py:854
+#: code:addons/share/wizard/share_wizard.py:821
+#: code:addons/share/wizard/share_wizard.py:853
#, python-format
msgid "Hello,\n"
"\n"
@@ -218,7 +218,7 @@ msgid "Hello,\n"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:823
+#: code:addons/share/wizard/share_wizard.py:822
#, python-format
msgid "I have shared %s (%s) with you!\n"
"\n"
@@ -226,7 +226,7 @@ msgid "I have shared %s (%s) with you!\n"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:854
#, python-format
msgid "I've shared %s with you!\n"
"\n"
@@ -245,19 +245,19 @@ msgid "Include an Optional Personal Message"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:615
+#: code:addons/share/wizard/share_wizard.py:614
#, python-format
msgid "Indirect sharing filter created by user %s (%s) for group %s"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:796
+#: code:addons/share/wizard/share_wizard.py:795
#, python-format
msgid "Invitation"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:821
+#: code:addons/share/wizard/share_wizard.py:820
#, python-format
msgid "Invitation to collaborate about %s"
msgstr ""
@@ -330,11 +330,11 @@ msgid "Non-Share Groups"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:835
-#: code:addons/share/wizard/share_wizard.py:869
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:868
#, python-format
msgid "Odoo is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
-"It is open source and can be found on http://www.openerp.com."
+"It is open source and can be found on https://www.odoo.com."
msgstr ""
#. module: share
@@ -353,8 +353,8 @@ msgid "Or insert the following code where you want to embed your documents"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:862
+#: code:addons/share/wizard/share_wizard.py:829
+#: code:addons/share/wizard/share_wizard.py:861
#: field:share.wizard.result.line,password:0
#, python-format
msgid "Password"
@@ -366,7 +366,7 @@ msgid "Personal Message"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:648
+#: code:addons/share/wizard/share_wizard.py:647
#, python-format
msgid "Please indicate the emails of the persons to share with, one per line."
msgstr ""
@@ -377,7 +377,7 @@ msgid "Please select the action that opens the screen containing the data you wa
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:759
+#: code:addons/share/wizard/share_wizard.py:758
#, python-format
msgid "Record id not found"
msgstr ""
@@ -454,7 +454,7 @@ msgid "Share your documents"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:772
+#: code:addons/share/wizard/share_wizard.py:771
#, python-format
msgid "Shared access created!"
msgstr ""
@@ -471,13 +471,13 @@ msgstr ""
#. module: share
#: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:636
+#: code:addons/share/wizard/share_wizard.py:635
#, python-format
msgid "Sharing access cannot be created."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:578
+#: code:addons/share/wizard/share_wizard.py:577
#, python-format
msgid "Sharing filter created by user %s (%s) for group %s"
msgstr ""
@@ -493,7 +493,7 @@ msgid "Sharing: preparation"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:637
+#: code:addons/share/wizard/share_wizard.py:636
#, python-format
msgid "Sorry, the current screen and filter you are trying to share are not supported at the moment.\n"
"You may want to try a simpler filter."
@@ -511,15 +511,15 @@ msgid "The action that opens the screen containing the data you wish to share."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:814
-#: code:addons/share/wizard/share_wizard.py:845
+#: code:addons/share/wizard/share_wizard.py:813
+#: code:addons/share/wizard/share_wizard.py:844
#, python-format
msgid "The current user must have an email address configured in User Preferences to be able to send outgoing emails."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:827
-#: code:addons/share/wizard/share_wizard.py:856
+#: code:addons/share/wizard/share_wizard.py:826
+#: code:addons/share/wizard/share_wizard.py:855
#, python-format
msgid "The documents are not attached, you can view them online directly on my Odoo server at:\n"
" %s\n"
@@ -528,14 +528,14 @@ msgid "The documents are not attached, you can view them online directly on my O
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:865
+#: code:addons/share/wizard/share_wizard.py:864
#, python-format
msgid "The documents have been automatically added to your current Odoo documents.\n"
""
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:832
+#: code:addons/share/wizard/share_wizard.py:831
#, python-format
msgid "The documents have been automatically added to your subscriptions.\n"
"\n"
@@ -543,14 +543,14 @@ msgid "The documents have been automatically added to your subscriptions.\n"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:759
+#: code:addons/share/wizard/share_wizard.py:758
#, python-format
msgid "The share engine has not been able to fetch a record_id for your invitation."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:828
-#: code:addons/share/wizard/share_wizard.py:860
+#: code:addons/share/wizard/share_wizard.py:827
+#: code:addons/share/wizard/share_wizard.py:859
#, python-format
msgid "These are your credentials to access this protected area:\n"
""
@@ -572,8 +572,8 @@ msgid "User"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:829
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:828
+#: code:addons/share/wizard/share_wizard.py:860
#, python-format
msgid "Username"
msgstr ""
@@ -584,14 +584,14 @@ msgid "Users"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:866
+#: code:addons/share/wizard/share_wizard.py:865
#, python-format
msgid "You may use your current login (%s) and password to view them.\n"
""
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:644
+#: code:addons/share/wizard/share_wizard.py:643
#, python-format
msgid "You must be a member of the Share/User group to use the share wizard."
msgstr ""
@@ -602,6 +602,12 @@ msgstr ""
msgid "You must configure your email address in the user preferences before using the Share button."
msgstr ""
+#. module: share
+#: view:share.wizard:share.share_step0_form
+#: view:share.wizard:share.share_step1_form
+msgid "or"
+msgstr ""
+
#. module: share
#: field:share.wizard.result.line,user_id:0
msgid "unknown"
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 561fdcae36d..38042112520 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-09-23 16:27+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -40,61 +40,61 @@ msgid "\n"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1603
+#: code:addons/stock/stock.py:1662
#, python-format
msgid " (%s reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1606
+#: code:addons/stock/stock.py:1665
#, python-format
msgid " (reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3016
+#: code:addons/stock/stock.py:3090
#, python-format
msgid " MTO"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:174
-#: code:addons/stock/product.py:330
+#: code:addons/stock/product.py:179
+#: code:addons/stock/product.py:335
#, python-format
msgid " On Hand"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3150
-#: code:addons/stock/stock.py:3426
+#: code:addons/stock/stock.py:3224
+#: code:addons/stock/stock.py:3498
#, python-format
msgid " Sequence in"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3154
-#: code:addons/stock/stock.py:3430
+#: code:addons/stock/stock.py:3228
+#: code:addons/stock/stock.py:3502
#, python-format
msgid " Sequence internal"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3151
-#: code:addons/stock/stock.py:3427
+#: code:addons/stock/stock.py:3225
+#: code:addons/stock/stock.py:3499
#, python-format
msgid " Sequence out"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3152
-#: code:addons/stock/stock.py:3428
+#: code:addons/stock/stock.py:3226
+#: code:addons/stock/stock.py:3500
#, python-format
msgid " Sequence packing"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3153
-#: code:addons/stock/stock.py:3429
+#: code:addons/stock/stock.py:3227
+#: code:addons/stock/stock.py:3501
#, python-format
msgid " Sequence picking"
msgstr ""
@@ -105,13 +105,13 @@ msgid " Stock Move Exists?"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2384
+#: code:addons/stock/stock.py:2444
#, python-format
msgid "%s %s %s has been moved to scrap."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2856
+#: code:addons/stock/stock.py:2930
#, python-format
msgid "%s: Supply Product from %s"
msgstr ""
@@ -321,13 +321,13 @@ msgstr ""
#. module: stock
#. openerp-web
-#: code:addons/stock/static/src/js/widgets.js:654
+#: code:addons/stock/static/src/js/widgets.js:656
#, python-format
msgid "\n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"
"
+msgstr ""
+
+#. module: website_forum
+#: model:email.template,subject:website_forum.validation_email
+msgid "${object.company_id.name} Forums validation"
+msgstr ""
+
#. module: website_forum
#: view:website:website_forum.header
msgid "×"
@@ -41,17 +72,22 @@ msgid "-1"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:328
+#: code:addons/website_forum/models/forum.py:374
#, python-format
msgid "
\n"
+" Order number: ${object.name}
\n"
+" Order total: ${object.amount_total} ${object.pricelist_id.currency_id.name}
\n"
+" Order date: ${object.date_order}
\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}
\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" Your reference: ${object.client_order_ref}
\n"
+" % endif\n"
+" % if object.user_id:\n"
+" Your contact: ${object.user_id.name}\n"
+" % endif\n"
+"
\n"
+"
\n"
+"
\n"
+"
\n"
+" \n"
+" ${object.company_id.name}
\n"
+"
\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}
\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}
\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n"
+" % endif\n"
+" \n"
+" % if object.company_id.phone:\n"
+"