diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 76792a10342..773bbb1bbb7 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,10 +18,11 @@ msgstr "" #. module: account #: model:mail.template,body_html:account.email_template_edi_invoice msgid "\n" +"

Dear ${object.partner_id.name} \n" "% set access_action = object.get_access_action()\n" "% set access_url = access_action['type'] == 'ir.actions.act_url' and access_action['url'] or '/report/pdf/account.report_invoice/' + str(object.id)\n" +"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" "\n" -"

Dear ${object.partner_id.name} \n" "% if object.partner_id.parent_id:\n" " (${object.partner_id.parent_id.name})\n" "% endif\n" @@ -34,10 +35,12 @@ msgid "\n" "from ${object.company_id.name}.\n" "

\n" "\n" +"% if is_inline:\n" "

\n" "
\n" " View Invoice\n" "
\n" +"% endif\n" "

\n" "\n" "% if object.state=='paid':\n" @@ -71,11 +74,15 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_code_digits -#: model:ir.model.fields,field_description:account.field_account_config_settings_code_digits #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_code_digits msgid "# of Digits" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_config_settings_code_digits +msgid "# of Digits *" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_report_nbr msgid "# of Lines" @@ -375,6 +382,11 @@ msgstr "" msgid " To " msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.view_account_config_settings +msgid "(*) This configuration value is related to the company you're logged in." +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate msgid "Duplicate" @@ -751,13 +763,13 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1335 +#: code:addons/account/models/account_invoice.py:1385 #, python-format msgid "A Payment Term should have its last line of type Balance." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1338 +#: code:addons/account/models/account_invoice.py:1388 #, python-format msgid "A Payment Term should have only one line of type Balance." msgstr "" @@ -810,14 +822,14 @@ msgid "A product in Odoo is something you sell or buy \n" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:750 +#: code:addons/account/models/account_move.py:734 #, python-format msgid "A reconciliation must involve at least 2 move lines." msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:867 -#: code:addons/account/models/account_bank_statement.py:870 +#: code:addons/account/models/account_bank_statement.py:865 +#: code:addons/account/models/account_bank_statement.py:868 #, python-format msgid "A selected move line was already reconciled." msgstr "" @@ -863,13 +875,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_report_account_id #: model:ir.model.fields,field_description:account.field_account_move_dummy_account_id #: model:ir.model.fields,field_description:account.field_account_move_line_account_id -#: model:ir.model.fields,field_description:account.field_account_operation_template_account_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_account_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_account_id #: model:ir.ui.view,arch_db:account.report_journal #: model:ir.ui.view,arch_db:account.report_partnerledger #: model:ir.ui.view,arch_db:account.report_trialbalance #: model:ir.ui.view,arch_db:account.view_account_form #: model:ir.ui.view,arch_db:account.view_account_move_line_filter -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form #: model:ir.ui.view,arch_db:account.view_account_search #, python-format msgid "Account" @@ -1158,7 +1171,6 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.account_account_menu #: model:ir.ui.menu,name:account.menu_finance -#: model:ir.ui.view,arch_db:account.product_template_form_view #: model:ir.ui.view,arch_db:account.view_partner_property_form msgid "Accounting" msgstr "" @@ -1265,8 +1277,9 @@ msgid "Add" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_has_second_line -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_has_second_line +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_has_second_line +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form msgid "Add a second line" msgstr "" @@ -1495,14 +1508,15 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount #: model:ir.model.fields,field_description:account.field_account_move_amount -#: model:ir.model.fields,field_description:account.field_account_operation_template_amount #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_amount +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_amount +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_amount #: model:ir.model.fields,field_description:account.field_account_tax_amount #: model:ir.model.fields,field_description:account.field_account_tax_template_amount #: model:ir.model.fields,field_description:account.field_cash_box_in_amount #: model:ir.model.fields,field_description:account.field_cash_box_out_amount #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_amount -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form #: model:ir.ui.view,arch_db:account.view_move_line_form #, python-format msgid "Amount" @@ -1547,8 +1561,9 @@ msgid "Amount in Currency" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_amount_type -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_amount_type +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_amount_type +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form msgid "Amount type" msgstr "" @@ -1605,8 +1620,8 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_line_account_analytic_id #: model:ir.model.fields,field_description:account.field_account_move_line_analytic_account_id #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_analytic_id -#: model:ir.model.fields,field_description:account.field_account_operation_template_analytic_account_id -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_analytic_account_id +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form msgid "Analytic Account" msgstr "" @@ -1840,7 +1855,7 @@ msgstr "" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:650 +#: code:addons/account/models/chart_template.py:685 #: model:ir.model.fields,field_description:account.field_account_journal_bank_id #: model:ir.model.fields,field_description:account.field_res_partner_bank_account_count #, python-format @@ -1876,11 +1891,15 @@ msgid "Bank Accounts" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_config_settings_bank_account_code_prefix #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_bank_account_code_prefix msgid "Bank Accounts Prefix" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_config_settings_bank_account_code_prefix +msgid "Bank Accounts Prefix *" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_bank_statements_source msgid "Bank Feeds" @@ -1909,12 +1928,12 @@ msgid "Bank Reconciliation" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_account_operation_template_tree +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_tree msgid "Bank Reconciliation Move Presets" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_account_operation_template_search +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_search msgid "Bank Reconciliation Move preset" msgstr "" @@ -2068,7 +2087,8 @@ msgid "Business Intelligence" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_name +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_name +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_name msgid "Button Label" msgstr "" @@ -2181,13 +2201,6 @@ msgstr "" msgid "Cancelled Invoice" msgstr "" -#. module: account -#: code:addons/account/models/account_move.py:1062 -#, 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/models/account_move.py:176 #, python-format @@ -2201,19 +2214,12 @@ msgid "Cannot create unbalanced journal entry." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:466 +#: code:addons/account/models/account_invoice.py:473 #, 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/models/account_move.py:335 -#, 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/models/account.py:393 #, python-format @@ -2241,17 +2247,21 @@ msgstr "" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:650 +#: code:addons/account/models/chart_template.py:685 #, python-format msgid "Cash" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_config_settings_cash_account_code_prefix #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_cash_account_code_prefix msgid "Cash Accounts Prefix" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_config_settings_cash_account_code_prefix +msgid "Cash Accounts Prefix *" +msgstr "" + #. module: account #: code:addons/account/models/account_bank_statement.py:203 #: model:ir.actions.act_window,name:account.action_view_account_bnk_stmt_cashbox @@ -2472,7 +2482,7 @@ msgid "Click to create a new cash log." msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_operation_template +#: model:ir.actions.act_window,help:account.action_account_reconcile_model msgid "Click to create a reconciliation model." msgstr "" @@ -2596,10 +2606,10 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_company_id #: model:ir.model.fields,field_description:account.field_account_move_line_company_id #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_company_id -#: model:ir.model.fields,field_description:account.field_account_operation_template_company_id #: model:ir.model.fields,field_description:account.field_account_payment_company_id #: model:ir.model.fields,field_description:account.field_account_payment_term_company_id #: model:ir.model.fields,field_description:account.field_account_print_journal_company_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_company_id #: model:ir.model.fields,field_description:account.field_account_register_payments_company_id #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_company_id #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_company_id @@ -2659,7 +2669,7 @@ msgid "Complete set of taxes" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:399 +#: code:addons/account/models/account_invoice.py:410 #, python-format msgid "Compose Email" msgstr "" @@ -2924,13 +2934,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_create_uid #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_create_uid #: model:ir.model.fields,field_description:account.field_account_move_reversal_create_uid -#: model:ir.model.fields,field_description:account.field_account_operation_template_create_uid #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_create_uid #: model:ir.model.fields,field_description:account.field_account_payment_create_uid #: model:ir.model.fields,field_description:account.field_account_payment_method_create_uid #: model:ir.model.fields,field_description:account.field_account_payment_term_create_uid #: model:ir.model.fields,field_description:account.field_account_payment_term_line_create_uid #: model:ir.model.fields,field_description:account.field_account_print_journal_create_uid +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_create_uid +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_create_uid #: model:ir.model.fields,field_description:account.field_account_register_payments_create_uid #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_create_uid #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_create_uid @@ -2986,13 +2997,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_create_date #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_create_date #: model:ir.model.fields,field_description:account.field_account_move_reversal_create_date -#: model:ir.model.fields,field_description:account.field_account_operation_template_create_date #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_create_date #: model:ir.model.fields,field_description:account.field_account_payment_create_date #: model:ir.model.fields,field_description:account.field_account_payment_method_create_date #: model:ir.model.fields,field_description:account.field_account_payment_term_create_date #: model:ir.model.fields,field_description:account.field_account_payment_term_line_create_date #: model:ir.model.fields,field_description:account.field_account_print_journal_create_date +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_create_date +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_create_date #: model:ir.model.fields,field_description:account.field_account_register_payments_create_date #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_create_date #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_create_date @@ -3054,6 +3066,11 @@ msgstr "" msgid "Credit move id" msgstr "" +#. module: account +#: model:ir.ui.menu,name:account.menu_action_currency_form +msgid "Currencies" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_currency_id #: model:ir.model.fields,field_description:account.field_account_analytic_line_company_currency_id @@ -3094,8 +3111,8 @@ msgid "Currency as per company's country." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1361 -#: code:addons/account/models/account_move.py:1371 +#: code:addons/account/models/account_move.py:1323 +#: code:addons/account/models/account_move.py:1333 #, python-format msgid "Currency exchange rate difference" msgstr "" @@ -3156,7 +3173,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_payment_term_id -msgid "Customer Payment Term" +msgid "Customer Payment Terms" msgstr "" #. module: account @@ -3491,13 +3508,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_display_name #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_display_name #: model:ir.model.fields,field_description:account.field_account_move_reversal_display_name -#: model:ir.model.fields,field_description:account.field_account_operation_template_display_name #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_display_name #: model:ir.model.fields,field_description:account.field_account_payment_display_name #: model:ir.model.fields,field_description:account.field_account_payment_method_display_name #: model:ir.model.fields,field_description:account.field_account_payment_term_display_name #: model:ir.model.fields,field_description:account.field_account_payment_term_line_display_name #: model:ir.model.fields,field_description:account.field_account_print_journal_display_name +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_display_name +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_display_name #: model:ir.model.fields,field_description:account.field_account_register_payments_display_name #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_display_name #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_display_name @@ -3651,7 +3669,7 @@ msgid "Due date" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:845 +#: code:addons/account/models/account_invoice.py:890 #, python-format msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/refund." msgstr "" @@ -3677,7 +3695,7 @@ msgid "Efficiency at its finest" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:903 +#: code:addons/account/models/account_move.py:887 #, python-format msgid "Either pass both debit and credit or none." msgstr "" @@ -3753,7 +3771,7 @@ msgid "Entries Sorted by" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:868 +#: code:addons/account/models/account_move.py:852 #, python-format msgid "Entries are not of the same account!" msgstr "" @@ -4020,8 +4038,10 @@ msgid "Fiscalyear last month" msgstr "" #. module: account -#: selection:account.operation.template,amount_type:0 -#: selection:account.operation.template,second_amount_type:0 +#: selection:account.reconcile.model,amount_type:0 +#: selection:account.reconcile.model,second_amount_type:0 +#: selection:account.reconcile.model.template,amount_type:0 +#: selection:account.reconcile.model.template,second_amount_type:0 #: selection:account.tax,amount_type:0 #: selection:account.tax.template,amount_type:0 msgid "Fixed" @@ -4038,8 +4058,10 @@ msgid "Fixed Assets" msgstr "" #. module: account -#: model:ir.model.fields,help:account.field_account_operation_template_amount -#: model:ir.model.fields,help:account.field_account_operation_template_second_amount +#: model:ir.model.fields,help:account.field_account_reconcile_model_amount +#: model:ir.model.fields,help:account.field_account_reconcile_model_second_amount +#: model:ir.model.fields,help:account.field_account_reconcile_model_template_amount +#: model:ir.model.fields,help:account.field_account_reconcile_model_template_second_amount msgid "Fixed amount will count as a debit if it is negative, as a credit if it is positive." msgstr "" @@ -4214,8 +4236,7 @@ msgid "Go to bank statements" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:467 -#: code:addons/account/models/account_move.py:336 +#: code:addons/account/models/account_invoice.py:474 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -4337,13 +4358,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_id #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_id #: model:ir.model.fields,field_description:account.field_account_move_reversal_id -#: model:ir.model.fields,field_description:account.field_account_operation_template_id #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_id #: model:ir.model.fields,field_description:account.field_account_payment_id #: model:ir.model.fields,field_description:account.field_account_payment_method_id #: model:ir.model.fields,field_description:account.field_account_payment_term_id #: model:ir.model.fields,field_description:account.field_account_payment_term_line_id #: model:ir.model.fields,field_description:account.field_account_print_journal_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_id #: model:ir.model.fields,field_description:account.field_account_register_payments_id #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_id #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_id @@ -4674,7 +4696,7 @@ msgid "Invite Users" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:895 +#: code:addons/account/models/account_invoice.py:940 #: model:ir.model,name:account.model_account_invoice #: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id #: model:ir.model.fields,field_description:account.field_res_partner_invoice_warn @@ -4750,6 +4772,37 @@ msgstr "" msgid "Invoice id" msgstr "" +#. module: account +#: code:addons/account/models/account_invoice.py:549 +#, python-format +msgid "Invoice must be a draft in order to set it to Pro-forma." +msgstr "" + +#. module: account +#: code:addons/account/models/account_invoice.py:529 +#, python-format +msgid "Invoice must be cancelled in order to reset it to draft." +msgstr "" + +#. module: account +#: code:addons/account/models/account_invoice.py:557 +#: code:addons/account/models/account_invoice.py:581 +#, python-format +msgid "Invoice must be in draft or Pro-forma state in order to validate it." +msgstr "" + +#. module: account +#: code:addons/account/models/account_invoice.py:575 +#, python-format +msgid "Invoice must be paid in order to set it to register payemnt." +msgstr "" + +#. module: account +#: code:addons/account/models/account_invoice.py:567 +#, python-format +msgid "Invoice must be validated in order to set it to register payemnt." +msgstr "" + #. module: account #: model:mail.message.subtype,description:account.mt_invoice_paid msgid "Invoice paid" @@ -4762,7 +4815,7 @@ msgid "Invoice refund" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1424 +#: code:addons/account/models/account_invoice.py:1474 #, python-format msgid "Invoice sent" msgstr "" @@ -4832,6 +4885,11 @@ msgstr "" msgid "Invoices to validate" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.product_template_form_view +msgid "Invoicing" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.view_account_config_settings msgid "Invoicing & Payments" @@ -4870,7 +4928,7 @@ msgid "It indicates that the invoice has been sent." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:901 +#: code:addons/account/models/account_move.py:885 #, python-format msgid "It is mandatory to specify an account and a journal to create a write-off." msgstr "" @@ -4941,14 +4999,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_report_journal_id #: model:ir.model.fields,field_description:account.field_account_move_journal_id #: model:ir.model.fields,field_description:account.field_account_move_line_journal_id -#: model:ir.model.fields,field_description:account.field_account_operation_template_journal_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_journal_id #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_journal_id #: model:ir.ui.view,arch_db:account.report_journal #: model:ir.ui.view,arch_db:account.view_account_journal_search #: model:ir.ui.view,arch_db:account.view_account_move_filter #: model:ir.ui.view,arch_db:account.view_account_move_line_filter -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form #: model:ir.ui.view,arch_db:account.view_account_payment_search +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form #: model:ir.ui.view,arch_db:account.view_bank_statement_search #, python-format msgid "Journal" @@ -5003,8 +5061,9 @@ msgid "Journal Item" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_label -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_label +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_label +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form msgid "Journal Item Label" msgstr "" @@ -5176,13 +5235,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile___last_update #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff___last_update #: model:ir.model.fields,field_description:account.field_account_move_reversal___last_update -#: model:ir.model.fields,field_description:account.field_account_operation_template___last_update #: model:ir.model.fields,field_description:account.field_account_partial_reconcile___last_update #: model:ir.model.fields,field_description:account.field_account_payment___last_update #: model:ir.model.fields,field_description:account.field_account_payment_method___last_update #: model:ir.model.fields,field_description:account.field_account_payment_term___last_update #: model:ir.model.fields,field_description:account.field_account_payment_term_line___last_update #: model:ir.model.fields,field_description:account.field_account_print_journal___last_update +#: model:ir.model.fields,field_description:account.field_account_reconcile_model___last_update +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template___last_update #: model:ir.model.fields,field_description:account.field_account_register_payments___last_update #: model:ir.model.fields,field_description:account.field_account_report_general_ledger___last_update #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger___last_update @@ -5252,13 +5312,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_write_uid #: model:ir.model.fields,field_description:account.field_account_move_reversal_write_uid #: model:ir.model.fields,field_description:account.field_account_move_write_uid -#: model:ir.model.fields,field_description:account.field_account_operation_template_write_uid #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_write_uid #: model:ir.model.fields,field_description:account.field_account_payment_method_write_uid #: model:ir.model.fields,field_description:account.field_account_payment_term_line_write_uid #: model:ir.model.fields,field_description:account.field_account_payment_term_write_uid #: model:ir.model.fields,field_description:account.field_account_payment_write_uid #: model:ir.model.fields,field_description:account.field_account_print_journal_write_uid +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_write_uid +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_write_uid #: model:ir.model.fields,field_description:account.field_account_register_payments_write_uid #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_write_uid #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_write_uid @@ -5314,13 +5375,14 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_write_date #: model:ir.model.fields,field_description:account.field_account_move_reversal_write_date #: model:ir.model.fields,field_description:account.field_account_move_write_date -#: model:ir.model.fields,field_description:account.field_account_operation_template_write_date #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_write_date #: model:ir.model.fields,field_description:account.field_account_payment_method_write_date #: model:ir.model.fields,field_description:account.field_account_payment_term_line_write_date #: model:ir.model.fields,field_description:account.field_account_payment_term_write_date #: model:ir.model.fields,field_description:account.field_account_payment_write_date #: model:ir.model.fields,field_description:account.field_account_print_journal_write_date +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_write_date +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_write_date #: model:ir.model.fields,field_description:account.field_account_register_payments_write_date #: model:ir.model.fields,field_description:account.field_account_report_general_ledger_write_date #: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_write_date @@ -5701,7 +5763,7 @@ msgid "Move line ids" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1187 +#: code:addons/account/models/account_move.py:1149 #, python-format msgid "Move name (id): %s (%s)" msgstr "" @@ -5783,7 +5845,7 @@ msgid "New Transactions" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1164 +#: code:addons/account/models/account_move.py:1126 #, python-format msgid "New expected payment date: " msgstr "" @@ -5809,7 +5871,7 @@ msgid "No Message" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1019 +#: code:addons/account/models/account_invoice.py:1064 #, python-format msgid "No appropriate payment method enabled on journal %s" msgstr "" @@ -6040,7 +6102,7 @@ msgid "Only a draft payment can be posted. Trying to post a payment in state %s. msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:743 +#: code:addons/account/models/chart_template.py:778 #, python-format msgid "Only administrators can change the settings" msgstr "" @@ -6086,12 +6148,12 @@ msgid "Opening Unit Numbers" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form msgid "Operation Templates" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:985 +#: code:addons/account/models/account_bank_statement.py:983 #, python-format msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it." msgstr "" @@ -6195,16 +6257,20 @@ msgid "Overdue" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_company_inherit_form +#: model:ir.ui.view,arch_db:account.view_account_config_settings msgid "Overdue Payments" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_company_overdue_msg -#: model:ir.ui.view,arch_db:account.view_company_inherit_form msgid "Overdue Payments Message" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_config_settings_overdue_msg +msgid "Overdue Payments Message *" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_filter msgid "Overdue invoices, maturity date passed" @@ -6437,14 +6503,6 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_payment_term -#: model:ir.model.fields,field_description:account.field_account_invoice_payment_term_id -#: model:ir.model.fields,field_description:account.field_account_invoice_report_payment_term_id -#: model:ir.model.fields,field_description:account.field_account_payment_term_line_payment_id -#: model:ir.model.fields,field_description:account.field_account_payment_term_name -#: model:ir.ui.view,arch_db:account.view_payment_term_form -#: model:ir.ui.view,arch_db:account.view_payment_term_line_form -#: model:ir.ui.view,arch_db:account.view_payment_term_line_tree -#: model:ir.ui.view,arch_db:account.view_payment_term_search msgid "Payment Term" msgstr "" @@ -6455,8 +6513,16 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_payment_term_form +#: model:ir.model.fields,field_description:account.field_account_invoice_payment_term_id +#: model:ir.model.fields,field_description:account.field_account_invoice_report_payment_term_id +#: model:ir.model.fields,field_description:account.field_account_payment_term_line_payment_id +#: model:ir.model.fields,field_description:account.field_account_payment_term_name #: model:ir.ui.menu,name:account.menu_action_payment_term_form #: model:ir.ui.view,arch_db:account.account_planner +#: model:ir.ui.view,arch_db:account.view_payment_term_form +#: model:ir.ui.view,arch_db:account.view_payment_term_line_form +#: model:ir.ui.view,arch_db:account.view_payment_term_line_tree +#: model:ir.ui.view,arch_db:account.view_payment_term_search msgid "Payment Terms" msgstr "" @@ -6570,19 +6636,21 @@ msgid "Percentage of Price Tax Included" msgstr "" #. module: account -#: selection:account.operation.template,second_amount_type:0 +#: selection:account.reconcile.model,second_amount_type:0 +#: selection:account.reconcile.model.template,second_amount_type:0 msgid "Percentage of amount" msgstr "" #. module: account -#: selection:account.operation.template,amount_type:0 +#: selection:account.reconcile.model,amount_type:0 +#: selection:account.reconcile.model.template,amount_type:0 msgid "Percentage of balance" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1406 +#: code:addons/account/models/account_invoice.py:1456 #, python-format -msgid "Percentages for Payment Term Line must be between 0 and 100." +msgid "Percentages for Payment Terms Line must be between 0 and 100." msgstr "" #. module: account @@ -6618,7 +6686,7 @@ msgid "Please check that the field 'Transfer Account' is set on the company." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:749 +#: code:addons/account/models/account_invoice.py:794 #, python-format msgid "Please create some invoice lines." msgstr "" @@ -6630,7 +6698,7 @@ msgid "Please define a sequence on the journal." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:747 +#: code:addons/account/models/account_invoice.py:792 #, python-format msgid "Please define sequence on the journal related to this invoice." msgstr "" @@ -6728,7 +6796,7 @@ msgid "Preserve balance sign" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_operation_template +#: model:ir.model,name:account.model_account_reconcile_model msgid "Preset to create journal entries during a invoices and payments matching" msgstr "" @@ -7006,7 +7074,7 @@ msgid "Reconciliation" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_account_operation_template +#: model:ir.actions.act_window,name:account.action_account_reconcile_model #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Reconciliation Models" msgstr "" @@ -7096,7 +7164,7 @@ msgid "Reference/Description" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:897 +#: code:addons/account/models/account_invoice.py:942 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model:ir.ui.view,arch_db:account.invoice_form #: model:ir.ui.view,arch_db:account.invoice_supplier_form @@ -7430,37 +7498,42 @@ msgid "Search Taxes" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_second_account_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_second_account_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_second_account_id msgid "Second Account" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_second_amount +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_second_amount +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_second_amount msgid "Second Amount" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_second_amount_type +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_second_amount_type +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_second_amount_type msgid "Second Amount type" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_second_analytic_account_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_second_analytic_account_id msgid "Second Analytic Account" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_second_journal_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_second_journal_id msgid "Second Journal" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_second_label +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_second_label +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_second_label msgid "Second Journal Item Label" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_operation_template_second_tax_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_second_tax_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_second_tax_id msgid "Second Tax" msgstr "" @@ -7550,8 +7623,9 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_line_sequence #: model:ir.model.fields,field_description:account.field_account_invoice_tax_sequence #: model:ir.model.fields,field_description:account.field_account_journal_sequence -#: model:ir.model.fields,field_description:account.field_account_operation_template_sequence #: model:ir.model.fields,field_description:account.field_account_payment_term_line_sequence +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_sequence +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_sequence #: model:ir.model.fields,field_description:account.field_account_tax_group_sequence #: model:ir.model.fields,field_description:account.field_account_tax_sequence #: model:ir.model.fields,field_description:account.field_account_tax_template_sequence @@ -7801,16 +7875,17 @@ msgstr "" #: model:ir.model,name:account.model_account_tax #: model:ir.model.fields,field_description:account.field_account_invoice_amount_tax #: model:ir.model.fields,field_description:account.field_account_invoice_tax_tax_id -#: model:ir.model.fields,field_description:account.field_account_operation_template_tax_id -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_tax_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_tax_id +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form #: model:ir.ui.view,arch_db:account.view_account_tax_search #, python-format msgid "Tax" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:724 -#: code:addons/account/models/chart_template.py:727 +#: code:addons/account/models/chart_template.py:759 +#: code:addons/account/models/chart_template.py:762 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -7935,7 +8010,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_tax_calculation_rounding_method -msgid "Tax calculation rounding method" +msgid "Tax calculation rounding method *" msgstr "" #. module: account @@ -8132,7 +8207,7 @@ msgid "The Deposit Ticket module can also be used to settle credit card batch ma msgstr "" #. module: account -#: code:addons/account/models/account_move.py:870 +#: code:addons/account/models/account_move.py:854 #, python-format msgid "The account %s (%s) is not marked as reconciliable !" msgstr "" @@ -8154,7 +8229,7 @@ msgid "The amount expressed in the related account currency if not equal to the msgstr "" #. module: account -#: code:addons/account/models/account_move.py:445 +#: code:addons/account/models/account_move.py:429 #, python-format msgid "The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited." msgstr "" @@ -8295,7 +8370,7 @@ msgid "The partner has at least one unreconciled debit and credit since last tim msgstr "" #. module: account -#: code:addons/account/models/account_move.py:872 +#: code:addons/account/models/account_move.py:856 #, python-format msgid "The partner has to be the same on all lines for receivable and payable accounts!" msgstr "" @@ -8322,13 +8397,13 @@ msgid "The residual amount on a journal item expressed in the company currency." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:430 +#: code:addons/account/models/account_move.py:414 #, python-format msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1268 +#: code:addons/account/models/account_invoice.py:1318 #, python-format msgid "The selected unit of measure is not compatible with the unit of measure of the product." msgstr "" @@ -8383,7 +8458,7 @@ msgid "These users handle billing specifically." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:996 +#: code:addons/account/models/account_invoice.py:1041 #, python-format msgid "This %s has been created from: %s" msgstr "" @@ -8486,8 +8561,8 @@ msgid "This field contains the information related to the numbering of the refun msgstr "" #. module: account -#: model:ir.model.fields,help:account.field_account_operation_template_journal_id -#: model:ir.model.fields,help:account.field_account_operation_template_second_journal_id +#: model:ir.model.fields,help:account.field_account_reconcile_model_journal_id +#: model:ir.model.fields,help:account.field_account_reconcile_model_second_journal_id msgid "This field is ignored in a bank statement reconciliation." msgstr "" @@ -8590,7 +8665,7 @@ msgid "This wizard will validate all journal entries selected. Once journal entr msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_operation_template +#: model:ir.actions.act_window,help:account.action_account_reconcile_model msgid "Those can be used to quickly create a journal items when reconciling\n" " a bank statement or an account." msgstr "" @@ -8628,7 +8703,7 @@ msgid "To manage the tax applied when invoicing a Company, Odoo uses the concept msgstr "" #. module: account -#: code:addons/account/models/account_move.py:866 +#: code:addons/account/models/account_move.py:850 #, python-format msgid "To reconcile the entries company should be the same for all entries!" msgstr "" @@ -8809,7 +8884,7 @@ msgid "Type" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:782 +#: code:addons/account/models/chart_template.py:817 #, python-format msgid "Undistributed Profits/Losses" msgstr "" @@ -8915,11 +8990,15 @@ msgid "Use" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_config_settings_use_anglo_saxon #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_use_anglo_saxon msgid "Use Anglo-Saxon Accounting" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_config_settings_use_anglo_saxon +msgid "Use Anglo-Saxon Accounting *" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_use_anglo_saxon msgid "Use Anglo-Saxon accounting" @@ -9051,7 +9130,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:896 +#: code:addons/account/models/account_invoice.py:941 #: model:ir.ui.view,arch_db:account.invoice_supplier_form #: model:ir.ui.view,arch_db:account.report_invoice_document #, python-format @@ -9080,7 +9159,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_supplier_payment_term_id -msgid "Vendor Payment Term" +msgid "Vendor Payment Terms" msgstr "" #. module: account @@ -9092,7 +9171,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:898 +#: code:addons/account/models/account_invoice.py:943 #: code:addons/account/models/account_payment.py:491 #: model:ir.ui.view,arch_db:account.report_invoice_document #, python-format @@ -9134,7 +9213,7 @@ msgid "Warning" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:486 +#: code:addons/account/models/account_invoice.py:493 #, python-format msgid "Warning for %s" msgstr "" @@ -9145,8 +9224,8 @@ msgid "Warning on the Invoice" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1208 -#: code:addons/account/models/account_invoice.py:1267 +#: code:addons/account/models/account_invoice.py:1258 +#: code:addons/account/models/account_invoice.py:1317 #, python-format msgid "Warning!" msgstr "" @@ -9225,7 +9304,7 @@ msgid "With movements" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_account_operation_template_search +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_search msgid "With tax" msgstr "" @@ -9235,7 +9314,7 @@ msgid "Wizard for Tax Adjustments" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:907 +#: code:addons/account/models/account_move.py:891 #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full #, python-format msgid "Write-Off" @@ -9267,7 +9346,7 @@ msgid "Wrong credit or debit value in accounting entry !" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:864 +#: code:addons/account/models/account_move.py:848 #, python-format msgid "You are trying to reconcile some entries that are already reconciled!" msgstr "" @@ -9284,7 +9363,7 @@ msgid "You can control the invoice from your vendor according to\n" msgstr "" #. module: account -#: code:addons/account/models/res_config.py:245 +#: code:addons/account/models/res_config.py:246 #, python-format msgid "You can not change a company chart of account once it has been installed" msgstr "" @@ -9325,7 +9404,7 @@ msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:877 +#: code:addons/account/models/account_invoice.py:922 #, python-format msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." msgstr "" @@ -9337,19 +9416,19 @@ msgid "You cannot change the owner company of an account that already contains j msgstr "" #. module: account -#: code:addons/account/models/account_move.py:437 +#: code:addons/account/models/account_move.py:421 #, python-format msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' field." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:440 +#: code:addons/account/models/account_invoice.py:447 #, 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/models/account_invoice.py:438 +#: code:addons/account/models/account_invoice.py:445 #, python-format msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead." msgstr "" @@ -9361,14 +9440,14 @@ msgid "You cannot do that on an account that contains journal items." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1189 +#: code:addons/account/models/account_move.py:1151 #, python-format msgid "You cannot do this modification on a posted journal entry, you can just change some non legal fields. You must revert the journal entry to cancel it.\n" "%s." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1191 +#: code:addons/account/models/account_move.py:1153 #, 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." @@ -9407,6 +9486,12 @@ msgid "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." msgstr "" +#. module: account +#: code:addons/account/models/account_invoice.py:569 +#, python-format +msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first." +msgstr "" + #. module: account #: code:addons/account/wizard/pos_box.py:36 #, python-format @@ -9420,14 +9505,14 @@ msgid "You cannot remove/deactivate an account which is set on a customer or ven msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1031 -#: code:addons/account/models/account_move.py:1155 +#: code:addons/account/models/account_move.py:1011 +#: code:addons/account/models/account_move.py:1117 #, python-format msgid "You cannot use deprecated account." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1086 +#: code:addons/account/models/account_move.py:1049 #, python-format msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal." msgstr "" @@ -9445,7 +9530,7 @@ msgid "You must define a Start Date" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1209 +#: code:addons/account/models/account_invoice.py:1259 #, python-format msgid "You must first select a partner!" msgstr "" @@ -9463,19 +9548,19 @@ msgid "You must set a start date." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1345 +#: code:addons/account/models/account_move.py:1307 #, python-format msgid "You should configure the 'Exchange Rate Journal' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1347 +#: code:addons/account/models/account_move.py:1309 #, python-format msgid "You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1349 +#: code:addons/account/models/account_move.py:1311 #, 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 "" @@ -9562,6 +9647,11 @@ msgstr "" msgid "account.config.settings" msgstr "" +#. module: account +#: model:ir.model,name:account.model_account_reconcile_model_template +msgid "account.reconcile.model.template" +msgstr "" + #. module: account #: model:ir.model,name:account.model_account_tax_group msgid "account.tax.group" @@ -9624,7 +9714,7 @@ msgid "days" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_account_operation_template_form +#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form msgid "e.g. Bank Fees" msgstr "" diff --git a/addons/auth_ldap/i18n/auth_ldap.pot b/addons/auth_ldap/i18n/auth_ldap.pot index d25fc3849df..f68219ee80f 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 9.saas~10c\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 14:07+0000\n" -"PO-Revision-Date: 2016-08-18 14:07+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -56,17 +56,22 @@ msgid "ID" msgstr "" #. module: auth_ldap -#: model:ir.ui.view,arch_db:auth_ldap.company_form_view +#: model:ir.ui.view,arch_db:auth_ldap.view_general_configuration_form_inherit_auth_ldap #: model:ir.ui.view,arch_db:auth_ldap.view_ldap_installer_form msgid "LDAP Configuration" msgstr "" #. module: auth_ldap #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldaps -#: model:ir.ui.view,arch_db:auth_ldap.company_form_view +#: model:ir.ui.view,arch_db:auth_ldap.view_general_configuration_form_inherit_auth_ldap msgid "LDAP Parameters" msgstr "" +#. module: auth_ldap +#: model:ir.model.fields,field_description:auth_ldap.field_base_config_settings_ldaps +msgid "LDAP Parameters *" +msgstr "" + #. module: auth_ldap #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap_ldap_server msgid "LDAP Server address" @@ -177,6 +182,11 @@ msgstr "" msgid "Users" msgstr "" +#. module: auth_ldap +#: model:ir.model,name:auth_ldap.model_base_config_settings +msgid "base.config.settings" +msgstr "" + #. module: auth_ldap #: model:ir.model,name:auth_ldap.model_res_company_ldap msgid "res.company.ldap" diff --git a/addons/auth_oauth/i18n/auth_oauth.pot b/addons/auth_oauth/i18n/auth_oauth.pot index 0515abca157..f453c620c53 100644 --- a/addons/auth_oauth/i18n/auth_oauth.pot +++ b/addons/auth_oauth/i18n/auth_oauth.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -123,7 +123,7 @@ msgstr "" #. module: auth_oauth #: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_payment_term_id -msgid "Customer Payment Term" +msgid "Customer Payment Terms" msgstr "" #. module: auth_oauth @@ -417,7 +417,7 @@ msgstr "" #. module: auth_oauth #: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_supplier_payment_term_id -msgid "Vendor Payment Term" +msgid "Vendor Payment Terms" msgstr "" #. module: auth_oauth diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot index 5963fe189bf..4de58cad199 100644 --- a/addons/base_setup/i18n/base_setup.pot +++ b/addons/base_setup/i18n/base_setup.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,16 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: base_setup +#: model:ir.ui.view,arch_db:base_setup.view_general_configuration +msgid "(reload fonts)" +msgstr "" + +#. module: base_setup +#: model:ir.ui.view,arch_db:base_setup.view_general_configuration +msgid "(*) This configuration value is related to the company you're logged in." +msgstr "" + #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_portal msgid "Activate the customer portal" @@ -65,6 +75,16 @@ msgstr "" msgid "Cancel" msgstr "" +#. module: base_setup +#: model:ir.model.fields,help:base_setup.field_base_config_settings_custom_footer +msgid "Check this to define the report footer manually. Otherwise it will be filled in automatically." +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id +msgid "Company" +msgstr "" + #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration msgid "Configure outgoing email servers" @@ -85,6 +105,16 @@ msgstr "" msgid "Created on" msgstr "" +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer +msgid "Custom Report Footer *" +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_custom_footer +msgid "Custom footer *" +msgstr "" + #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name msgid "Display Name" @@ -100,8 +130,20 @@ msgstr "" msgid "Email" msgstr "" +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_font +msgid "Font *" +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer +#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer_readonly +msgid "Footer text displayed at the bottom of all reports." +msgstr "" + #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_general_configuration +#: model:ir.ui.menu,name:base_setup.menu_config #: model:ir.ui.view,arch_db:base_setup.view_general_configuration msgid "General Settings" msgstr "" @@ -186,11 +228,56 @@ msgstr "" msgid "Once installed, you can configure your API credentials for \"Google calendar\"" msgstr "" +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_paper_format +msgid "Paper Format *" +msgstr "" + #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration msgid "Portal access" msgstr "" +#. module: base_setup +#: model:ir.ui.view,arch_db:base_setup.view_general_configuration +msgid "Preview RML Report" +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_header +msgid "RML Header *" +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_header2 +msgid "RML Internal Header *" +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_header3 +msgid "RML Internal Header for Landscape Reports *" +msgstr "" + +#. module: base_setup +#: model:ir.ui.view,arch_db:base_setup.view_general_configuration +msgid "RML Report Configuration" +msgstr "" + +#. module: base_setup +#: model:ir.ui.view,arch_db:base_setup.view_general_configuration +msgid "Report Configuration" +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer_readonly +msgid "Report Footer *" +msgstr "" + +#. module: base_setup +#: model:ir.model.fields,help:base_setup.field_base_config_settings_font +msgid "Set the font into the report header, it will be used as default font in the RML reports of the user company" +msgstr "" + #. module: base_setup #: model:ir.model.fields,help:base_setup.field_base_config_settings_module_share msgid "Share or embbed any screen of Odoo." diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot index b8e3ec159b7..1b03c684e87 100644 --- a/addons/calendar/i18n/calendar.pot +++ b/addons/calendar/i18n/calendar.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,8 +18,8 @@ msgstr "" #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_changedate msgid "\n" -"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n" "
\n" +"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n" " \n" " \n" "
\n" @@ -104,8 +104,8 @@ msgstr "" #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_invitation msgid "\n" -"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n" "
\n" +"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n" " \n" " \n" "
\n" @@ -189,8 +189,8 @@ msgstr "" #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_reminder msgid "\n" -"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n" "
\n" +"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n" " \n" " \n" "
\n" diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index d96129b0378..3230fd3497f 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:09+0000\n" +"PO-Revision-Date: 2016-09-05 14:09+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,9 +18,9 @@ msgstr "" #. module: crm #: model:mail.template,body_html:crm.mail_template_data_module_install_crm msgid "\n" -" % set last_created_team = user.env['crm.team'].search([], order=\"create_date desc\")[0]\n" "\n" "
\n" +" % set last_created_team = user.env['crm.team'].search([], order=\"create_date desc\")[0]\n" " \n" " \n" " \n" @@ -1735,6 +1735,13 @@ msgstr "" msgid "Global CC" msgstr "" +#. module: crm +#. openerp-web +#: code:addons/crm/static/src/js/tour.js:80 +#, python-format +msgid "Good job! Your completed the tour of the CRM. You can continue with the implementation guide to help you setup the CRM in your company." +msgstr "" + #. module: crm #: model:ir.ui.view,arch_db:crm.crm_planner msgid "Great pipelines have stages aligned with the buyer's buying process, not your selling process:" @@ -1877,6 +1884,11 @@ msgstr "" msgid "If you want to do it yourself:" msgstr "" +#. module: crm +#: model:ir.ui.menu,name:crm.menu_import_crm +msgid "Import & Synchronize" +msgstr "" + #. module: crm #: model:ir.ui.view,arch_db:crm.crm_planner msgid "Import using the top left button in" @@ -2073,6 +2085,11 @@ msgstr "" msgid "Leads" msgstr "" +#. module: crm +#: model:ir.ui.menu,name:crm.menu_crm_config_lead +msgid "Leads & Opportunities" +msgstr "" + #. module: crm #: code:addons/crm/models/crm_lead.py:59 #, python-format @@ -2652,6 +2669,7 @@ msgstr "" #: model:ir.model.fields,field_description:crm.field_crm_team_use_opportunities #: model:ir.model.fields,field_description:crm.field_res_partner_opportunity_ids #: model:ir.model.fields,field_description:crm.field_res_users_opportunity_ids +#: model:ir.ui.menu,name:crm.menu_crm_config_opportunity #: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor #: model:ir.ui.view,arch_db:crm.crm_case_graph_view_leads @@ -3666,6 +3684,13 @@ msgid "Use subscription for recurring billing.\n" " subscription to a service, etc." msgstr "" +#. module: crm +#. openerp-web +#: code:addons/crm/static/src/js/tour.js:84 +#, python-format +msgid "Use the implementation guide to setup the CRM in your company." +msgstr "" + #. module: crm #. openerp-web #: code:addons/crm/static/src/js/tour.js:66 diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index 14e485b8650..5e3f2521b5a 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1070,6 +1070,11 @@ msgstr "" msgid "Procurement Location" msgstr "" +#. module: delivery +#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_variant_id +msgid "Product" +msgstr "" + #. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_alert_time msgid "Product Alert Time" diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 8b37b9bd69e..8fc791cf1f8 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,9 +18,9 @@ msgstr "" #. module: event #: model:mail.template,body_html:event.event_reminder msgid "\n" +"
\n" "% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')\n" "% set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ')\n" -"
\n" "
\n" " \n" " \n" @@ -145,9 +145,9 @@ msgstr "" #. module: event #: model:mail.template,body_html:event.event_subscription msgid "\n" +"
\n" "% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')\n" "% set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ')\n" -"
\n" "
\n" " \n" " \n" @@ -478,7 +478,7 @@ msgid "Click to add a new event." msgstr "" #. module: event -#: code:addons/event/models/event.py:218 +#: code:addons/event/models/event.py:220 #, python-format msgid "Closing Date cannot be set before Beginning Date." msgstr "" @@ -492,7 +492,7 @@ msgid "Company" msgstr "" #. module: event -#: code:addons/event/models/event.py:414 +#: code:addons/event/models/event.py:416 #, python-format msgid "Compose Email" msgstr "" @@ -590,13 +590,13 @@ msgid "Creation Date" msgstr "" #. module: event -#: code:addons/event/models/event.py:391 +#: code:addons/event/models/event.py:393 #, python-format msgid "Customer" msgstr "" #. module: event -#: code:addons/event/models/event.py:393 +#: code:addons/event/models/event.py:395 #, python-format msgid "Customer Email" msgstr "" @@ -1068,7 +1068,7 @@ msgid "New" msgstr "" #. module: event -#: code:addons/event/models/event.py:441 +#: code:addons/event/models/event.py:442 #, python-format msgid "Next month" msgstr "" @@ -1084,13 +1084,13 @@ msgid "No mini website per event" msgstr "" #. module: event -#: code:addons/event/models/event.py:212 +#: code:addons/event/models/event.py:214 #, python-format msgid "No more available seats." msgstr "" #. module: event -#: code:addons/event/models/event.py:312 +#: code:addons/event/models/event.py:314 #, python-format msgid "No more seats available for this event." msgstr "" @@ -1345,13 +1345,13 @@ msgid "This field contains the template of the mail that will be automatically s msgstr "" #. module: event -#: code:addons/event/models/event.py:439 +#: code:addons/event/models/event.py:440 #, python-format msgid "This month" msgstr "" #. module: event -#: code:addons/event/models/event.py:437 +#: code:addons/event/models/event.py:438 #, python-format msgid "This week" msgstr "" @@ -1367,13 +1367,13 @@ msgid "Timezone" msgstr "" #. module: event -#: code:addons/event/models/event.py:433 +#: code:addons/event/models/event.py:434 #, python-format msgid "Today" msgstr "" #. module: event -#: code:addons/event/models/event.py:435 +#: code:addons/event/models/event.py:436 #, python-format msgid "Tomorrow" msgstr "" @@ -1447,13 +1447,13 @@ msgid "When to Run " msgstr "" #. module: event -#: code:addons/event/models/event.py:244 +#: code:addons/event/models/event.py:246 #, python-format msgid "You have already set a registration for this event as 'Attended'. Please reset it to draft if you want to cancel this event." msgstr "" #. module: event -#: code:addons/event/models/event.py:369 +#: code:addons/event/models/event.py:371 #, python-format msgid "You must wait for the starting day of the event to do this action." msgstr "" diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index ad4af4a94a5..c2dcea8996e 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -48,12 +48,22 @@ msgstr "" msgid "Active" msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_account_analytic_account +msgid "Analytic Account" +msgstr "" + #. module: hr #: model:ir.ui.view,arch_db:hr.view_department_filter #: model:ir.ui.view,arch_db:hr.view_employee_filter msgid "Archived" msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_event_registration +msgid "Attendee" +msgstr "" + #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_bank_account_id msgid "Bank Account Number" @@ -189,6 +199,11 @@ msgstr "" msgid "Departments" msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_mail_channel +msgid "Discussion channel" +msgstr "" + #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_department_display_name #: model:ir.model.fields,field_description:hr.field_hr_employee_category_display_name @@ -207,6 +222,16 @@ msgstr "" msgid "Efficiency Factor" msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_mail_alias +msgid "Email Aliases" +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_mail_thread +msgid "Email Thread" +msgstr "" + #. module: hr #: model:ir.model,name:hr.model_hr_employee #: model:ir.ui.view,arch_db:hr.view_employee_form @@ -277,6 +302,11 @@ msgstr "" msgid "Error! You cannot create recursive hierarchy of Employee(s)." msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_event_event +msgid "Event" +msgstr "" + #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_job_no_of_recruitment msgid "Expected New Employees" @@ -302,6 +332,16 @@ msgstr "" msgid "Followers" msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_gamification_badge +msgid "Gamification badge" +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_gamification_challenge +msgid "Gamification challenge" +msgstr "" + #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_gender msgid "Gender" @@ -366,6 +406,11 @@ msgstr "" msgid "In Recruitment" msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_fleet_vehicle +msgid "Information on a vehicle" +msgstr "" + #. module: hr #: model:ir.ui.view,arch_db:hr.view_employee_filter #: model:ir.ui.view,arch_db:hr.view_hr_job_form @@ -386,8 +431,6 @@ msgstr "" #. module: hr #: model:ir.actions.act_window,name:hr.action_hr_job -#: model:ir.ui.menu,name:hr.menu_hr_job_position -#: model:ir.ui.menu,name:hr.menu_hr_job_position_config msgid "Job Positions" msgstr "" @@ -459,9 +502,15 @@ msgstr "" #: model:ir.model.fields,field_description:hr.field_hr_department_manager_id #: model:ir.model.fields,field_description:hr.field_hr_employee_parent_id #: model:ir.ui.view,arch_db:hr.view_employee_filter +#: model:res.groups,name:hr.group_hr_manager msgid "Manager" msgstr "" +#. module: hr +#: model:res.groups,name:hr.group_hr_attendance +msgid "Manual Attendances" +msgstr "" + #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_marital msgid "Marital Status" @@ -544,6 +593,11 @@ msgid "Odoo's department structure is used to manage all documents\n" " leaves and holidays, recruitments, etc." msgstr "" +#. module: hr +#: model:res.groups,name:hr.group_hr_user +msgid "Officer" +msgstr "" + #. module: hr #: selection:hr.employee,gender:0 msgid "Other" @@ -711,11 +765,21 @@ msgstr "" msgid "Tags" msgstr "" +#. module: hr +#: model:ir.model,name:hr.model_mail_test +msgid "Test Mail Model" +msgstr "" + #. module: hr #: sql_constraint:hr.job:0 msgid "The name of the job position must be unique per department in company!" msgstr "" +#. module: hr +#: model:res.groups,comment:hr.group_hr_attendance +msgid "The user will gain access to the human resources attendance menu, enabling him to manage his own attendance." +msgstr "" + #. module: hr #: model:ir.model.fields,help:hr.field_hr_employee_time_efficiency msgid "This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficiency of 200%, then his load will only be 50%." @@ -804,6 +868,22 @@ msgid "You can attach a survey to a job position. It will be used in\n" " position." msgstr "" +#. module: hr +#: model:mail.template,subject:hr.mail_template_data_unknown_employee_email_address +msgid "Your document has not been created" +msgstr "" + +#. module: hr +#: model:mail.template,body_html:hr.mail_template_data_unknown_employee_email_address +msgid "Your document has not been created because your email address is not recognized. Please send emails with the email address recorded on your employee information, or contact your HR manager." +msgstr "" + +#. module: hr +#: code:addons/hr/models/mail_thread.py:41 +#, python-format +msgid "alias %s does not accept unknown employees" +msgstr "" + #. module: hr #: model:ir.ui.view,arch_db:hr.view_department_form msgid "department" @@ -819,3 +899,19 @@ msgstr "" msgid "e.g. Sales Manager" msgstr "" +#. module: hr +#: code:addons/hr/models/mail_thread.py:41 +#, python-format +msgid "skipping" +msgstr "" + +#. module: hr +#: model:res.groups,comment:hr.group_hr_user +msgid "the user will be able to approve document created by employees." +msgstr "" + +#. module: hr +#: model:res.groups,comment:hr.group_hr_manager +msgid "the user will have an access to the human resources configuration as well as statistic reports." +msgstr "" + diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot index d0b61c617f7..8820589ee4f 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -281,6 +281,11 @@ msgstr "" msgid "Employees must enter their PIN to check in manually in the \"Company Screen\"." msgstr "" +#. module: hr_attendance +#: model:res.groups,name:hr_attendance.group_hr_attendance_use_pin +msgid "Enable PIN use" +msgstr "" + #. module: hr_attendance #: model:ir.model.fields,help:hr_attendance.field_base_config_settings_group_attendance_use_pin msgid "Enable or disable employee PIN identification at check in" @@ -569,6 +574,11 @@ msgstr "" msgid "The employee will have access to the \"My Attendances\" menu to perform his check in and out from his session" msgstr "" +#. module: hr_attendance +#: model:res.groups,comment:hr_attendance.group_hr_attendance_use_pin +msgid "The user will have to enter his PIN to check in and out manually at the company screen." +msgstr "" + #. module: hr_attendance #: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter msgid "Today" diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot index bd744032f2f..90e4ed7a973 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -92,17 +92,7 @@ msgstr "" #. module: hr_expense #: code:addons/hr_expense/wizard/hr_expense_register_payment.py:79 #, python-format -msgid "A payment of %s %s with the reference %s related to your expense %s has been made." -msgstr "" - -#. module: hr_expense -#: selection:hr.expense.config.settings,alias_expense_open:0 -msgid "Accept expenses from any email address" -msgstr "" - -#. module: hr_expense -#: selection:hr.expense.config.settings,alias_expense_open:0 -msgid "Accept expenses from employee email addresses only" +msgid "A payment of %s %s with the reference %s related to your expense %s has been made." msgstr "" #. module: hr_expense @@ -110,6 +100,11 @@ msgstr "" msgid "Account" msgstr "" +#. module: hr_expense +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_accountant +msgid "Accountant" +msgstr "" + #. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view msgid "Accounting" @@ -131,16 +126,14 @@ msgid "Alias Domain" msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_all -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_all -msgid "All Expenses" +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all +msgid "All Expense Reports" msgstr "" #. module: hr_expense -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_all -msgid "All Reports" +#: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_all +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_all_expenses +msgid "All Expenses" msgstr "" #. module: hr_expense @@ -203,7 +196,6 @@ msgstr "" #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_pay #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_post #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_all -#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_to_approve msgid "Click here to create a new expense report." msgstr "" @@ -215,7 +207,7 @@ msgid "Click here to create new expenses." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:284 +#: code:addons/hr_expense/models/hr_expense.py:287 #, python-format msgid "Click to add a new expense," msgstr "" @@ -419,6 +411,7 @@ msgid "Expense Report Summary" msgstr "" #. module: hr_expense +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports #: model:ir.ui.view,arch_db:hr_expense.hr_department_view_kanban #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_tree @@ -430,6 +423,21 @@ msgstr "" msgid "Expense Reports Analysis" msgstr "" +#. module: hr_expense +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_approve +msgid "Expense Reports To Approve" +msgstr "" + +#. module: hr_expense +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_pay +msgid "Expense Reports To Pay" +msgstr "" + +#. module: hr_expense +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_post +msgid "Expense Reports To Post" +msgstr "" + #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_department_to_approve msgid "Expense Reports to Approve" @@ -440,24 +448,29 @@ msgstr "" msgid "Expense Sheet" msgstr "" -#. module: hr_expense -#: model:mail.message.subtype,description:hr_expense.mt_expense_approved -msgid "Expense approved" -msgstr "" - -#. module: hr_expense -#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed -msgid "Expense confirmed, waiting confirmation" -msgstr "" - #. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form msgid "Expense refuse reason" msgstr "" +#. module: hr_expense +#: model:mail.message.subtype,description:hr_expense.mt_expense_approved +msgid "Expense report approved" +msgstr "" + +#. module: hr_expense +#: model:mail.message.subtype,description:hr_expense.mt_expense_paid +msgid "Expense report paid" +msgstr "" + #. module: hr_expense #: model:mail.message.subtype,description:hr_expense.mt_expense_refused -msgid "Expense refused" +msgid "Expense report refused" +msgstr "" + +#. module: hr_expense +#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed +msgid "Expense report submitted, waiting approval" msgstr "" #. module: hr_expense @@ -511,19 +524,19 @@ msgid "Expenses by Month" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:391 +#: code:addons/hr_expense/models/hr_expense.py:381 #, python-format msgid "Expenses must belong to the same Employee." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:502 +#: code:addons/hr_expense/models/hr_expense.py:486 #, python-format msgid "Expenses must have an expense journal specified to generate accounting entries." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:395 +#: code:addons/hr_expense/models/hr_expense.py:385 #, python-format msgid "Expenses must have been paid by the same entity (Company or employee)" msgstr "" @@ -539,6 +552,11 @@ msgstr "" msgid "Expenses to Invoice" msgstr "" +#. module: hr_expense +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses_to_submit +msgid "Expenses to Submit" +msgstr "" + #. module: hr_expense #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all msgid "Expenses will go through these steps:" @@ -606,7 +624,7 @@ msgstr "" #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_id -#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_8838 +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_8881 msgid "ID" msgstr "" @@ -647,11 +665,6 @@ msgstr "" msgid "Last Updated on" msgstr "" -#. module: hr_expense -#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_alias_expense_open -msgid "Mail Gateway" -msgstr "" - #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:41 @@ -665,7 +678,6 @@ msgid "Memo" msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_my_all #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter msgid "My Expenses" @@ -673,7 +685,6 @@ msgstr "" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_my_unsubmitted -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_unsubmitted msgid "My Expenses to Report" msgstr "" @@ -683,8 +694,6 @@ msgstr "" #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_to_pay #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_to_post #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all -#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_to_approve -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter msgid "My Reports" msgstr "" @@ -716,19 +725,19 @@ msgid "New Mail" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:232 +#: code:addons/hr_expense/models/hr_expense.py:235 #, python-format msgid "No Expense account found for the product %s (or for it's category), please configure one." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:200 +#: code:addons/hr_expense/models/hr_expense.py:204 #, python-format msgid "No Home Address found for the employee %s, please configure one." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:196 +#: code:addons/hr_expense/models/hr_expense.py:200 #, python-format msgid "No credit account found for the %s journal, please configure one." msgstr "" @@ -750,7 +759,7 @@ msgid "Number of Attachments" msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all +#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted msgid "Once approved, your expense report, goes to the accounting," msgstr "" @@ -766,7 +775,6 @@ msgstr "" #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_pay #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_post #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_all -#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_to_approve #: model:ir.actions.act_window,help:hr_expense.action_request_approve_expense_sheet #: model:ir.actions.act_window,help:hr_expense.action_request_to_pay_expense_sheet #: model:ir.actions.act_window,help:hr_expense.action_request_to_post_expense_sheet @@ -781,6 +789,7 @@ msgstr "" #. module: hr_expense #: selection:hr.expense.sheet,state:0 +#: model:mail.message.subtype,name:hr_expense.mt_expense_paid msgid "Paid" msgstr "" @@ -816,8 +825,8 @@ msgid "Payment Type" msgstr "" #. module: hr_expense +#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all -#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted msgid "Periodically, you submit expenses report to your manager," msgstr "" @@ -828,7 +837,7 @@ msgid "Planner" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:236 +#: code:addons/hr_expense/models/hr_expense.py:239 #, python-format msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`." msgstr "" @@ -910,6 +919,8 @@ msgid "Refused" msgstr "" #. module: hr_expense +#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_refused_expenses +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses_refused #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter msgid "Refused Expenses" msgstr "" @@ -933,18 +944,8 @@ msgid "Reported" msgstr "" #. module: hr_expense -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_approve -msgid "Reports To Approve" -msgstr "" - -#. module: hr_expense -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_pay -msgid "Reports To Pay" -msgstr "" - -#. module: hr_expense -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_post -msgid "Reports To Post" +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_reports +msgid "Reports" msgstr "" #. module: hr_expense @@ -975,7 +976,7 @@ msgid "Save the report, your manager will receive a notification by email to app msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:87 +#: code:addons/hr_expense/models/hr_expense.py:88 #, python-format msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure" msgstr "" @@ -1005,6 +1006,11 @@ msgstr "" msgid "Specify whether the product can be selected in an HR expense." msgstr "" +#. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter +msgid "State" +msgstr "" + #. module: hr_expense #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_state #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_state @@ -1034,6 +1040,7 @@ msgstr "" #. module: hr_expense #: selection:hr.expense.sheet,state:0 +#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed msgid "Submitted" msgstr "" @@ -1069,7 +1076,7 @@ msgid "The accountant can register a payment to reimburse the employee directly. msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all +#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted msgid "The accountant validates entries and reimburse you." msgstr "" @@ -1079,12 +1086,6 @@ msgstr "" msgid "The accountant validates journal entries and reimburse you." msgstr "" -#. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:478 -#, python-format -msgid "The expense has been validated by %s" -msgstr "" - #. module: hr_expense #: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_journal_id msgid "The journal used when the expense is done." @@ -1103,15 +1104,14 @@ msgid "The photo of the receipt and the description of the email will\n" msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all +#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted msgid "The steps to process expenses are:" msgstr "" #. module: hr_expense -#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_to_approve +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_to_approve #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter -#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed msgid "To Approve" msgstr "" @@ -1210,7 +1210,7 @@ msgid "We hope this feature helped you manage your expenses efficiently." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:499 +#: code:addons/hr_expense/models/hr_expense.py:483 #, python-format msgid "You can only generate accounting entry for approved expense(s)." msgstr "" @@ -1232,7 +1232,13 @@ msgid "You can setup a generic email alias to create\n" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:103 +#: code:addons/hr_expense/models/hr_expense.py:106 +#, python-format +msgid "You cannot report expenses for different employees in the same report!" +msgstr "" + +#. module: hr_expense +#: code:addons/hr_expense/models/hr_expense.py:104 #, python-format msgid "You cannot report twice the same line!" msgstr "" @@ -1243,7 +1249,7 @@ msgid "You record expenses" msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all +#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_refused_expenses #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted msgid "You record expenses," msgstr "" @@ -1254,22 +1260,11 @@ msgid "Your Email Address" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:473 -#: code:addons/hr_expense/models/hr_expense.py:485 +#: code:addons/hr_expense/models/hr_expense.py:465 #, python-format msgid "Your Expense %s has been refused.
  • Reason : %s
" msgstr "" -#. module: hr_expense -#: model:mail.template,subject:hr_expense.mail_template_data_expense_unknown_email_address -msgid "Your expense has not been created" -msgstr "" - -#. module: hr_expense -#: model:mail.template,body_html:hr_expense.mail_template_data_expense_unknown_email_address -msgid "Your expense has not been created because your email address is not set on an employee or on a employee's user. Configure your employee's information correctly and try again." -msgstr "" - #. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view msgid "e.g. Lunch" @@ -1296,7 +1291,7 @@ msgid "or" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:285 +#: code:addons/hr_expense/models/hr_expense.py:288 #, python-format msgid "or send receipts by email to %s." msgstr "" diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 890854b39dc..eccee6dca8b 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -655,6 +655,36 @@ msgstr "" msgid "Leave Types" msgstr "" +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:445 +#, python-format +msgid "Leave request must be confirmed (\"To Approve\") in order to approve it." +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:460 +#, python-format +msgid "Leave request must be confirmed in order to approve it." +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:519 +#, python-format +msgid "Leave request must be confirmed or validated in order to refuse it." +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:432 +#, python-format +msgid "Leave request must be in Draft state (\"To Submit\") in order to confirm it." +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:417 +#, python-format +msgid "Leave request state must be \"Refused\" or \"To Approve\" in order to reset to Draft." +msgstr "" + #. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_leave_to_approve_count msgid "Leave to Approve" @@ -907,6 +937,31 @@ msgid "Once you have recorded your leave request, it will be sent\n" " number of open days related to your leave." msgstr "" +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:462 +#, python-format +msgid "Only an HR Manager can apply the second approval on leave requests." +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:415 +#, python-format +msgid "Only an HR Manager or the concerned employee can reset to draft." +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:440 +#: code:addons/hr_holidays/models/hr_holidays.py:455 +#, python-format +msgid "Only an HR Officer or Manager can approve leave requests." +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:514 +#, python-format +msgid "Only an HR Officer or Manager can refuse leave requests." +msgstr "" + #. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_parent_id msgid "Parent" @@ -1245,20 +1300,20 @@ msgid "You can not have 2 leaves that overlaps on same day!" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/models/hr_holidays.py:367 +#: code:addons/hr_holidays/models/hr_holidays.py:371 #, python-format msgid "You cannot delete a leave which is in %s state." msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/models/hr.py:139 +#: code:addons/hr_holidays/models/hr.py:140 #, python-format msgid "You cannot reduce validated allocation requests" msgstr "" #. module: hr_holidays #: code:addons/hr_holidays/models/hr_holidays.py:350 -#: code:addons/hr_holidays/models/hr_holidays.py:359 +#: code:addons/hr_holidays/models/hr_holidays.py:361 #, python-format msgid "You cannot set a leave request as '%s'. Contact a human resource manager." msgstr "" diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot index ccf4db9d18a..58430db5ed4 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -215,9 +215,15 @@ msgstr "" msgid "Cancel Payslip" msgstr "" +#. module: hr_payroll +#: code:addons/hr_payroll/models/hr_payroll.py:238 +#, python-format +msgid "Cannot cancel a payslip that is done." +msgstr "" + #. module: hr_payroll #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_category_id -#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_9022 +#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_9064 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_rule_filter msgid "Category" msgstr "" @@ -761,7 +767,7 @@ msgid "Name" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:321 +#: code:addons/hr_payroll/models/hr_payroll.py:323 #, python-format msgid "Normal Working Days paid at 100%" msgstr "" @@ -867,7 +873,7 @@ msgid "Payslip" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:223 +#: code:addons/hr_payroll/models/hr_payroll.py:224 #, python-format msgid "Payslip 'Date From' must be before 'Date To'." msgstr "" @@ -1052,7 +1058,7 @@ msgid "Refund" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:241 +#: code:addons/hr_payroll/models/hr_payroll.py:244 #, python-format msgid "Refund: " msgstr "" @@ -1123,8 +1129,8 @@ msgid "Salary Rules" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:546 -#: code:addons/hr_payroll/models/hr_payroll.py:593 +#: code:addons/hr_payroll/models/hr_payroll.py:548 +#: code:addons/hr_payroll/models/hr_payroll.py:595 #, python-format msgid "Salary Slip of %s for %s" msgstr "" @@ -1315,37 +1321,37 @@ msgid "Worked Days & Inputs" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:768 +#: code:addons/hr_payroll/models/hr_payroll.py:770 #, python-format msgid "Wrong percentage base or quantity defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:774 +#: code:addons/hr_payroll/models/hr_payroll.py:776 #, python-format msgid "Wrong python code defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:797 +#: code:addons/hr_payroll/models/hr_payroll.py:799 #, python-format msgid "Wrong python condition defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:761 +#: code:addons/hr_payroll/models/hr_payroll.py:763 #, python-format msgid "Wrong quantity defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:791 +#: code:addons/hr_payroll/models/hr_payroll.py:793 #, python-format msgid "Wrong range condition defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:266 +#: code:addons/hr_payroll/models/hr_payroll.py:268 #, python-format msgid "You cannot delete a payslip which is not draft or cancelled!" msgstr "" @@ -1357,7 +1363,7 @@ msgid "You must select employee(s) to generate payslip(s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:836 +#: code:addons/hr_payroll/models/hr_payroll.py:838 #, python-format msgid "You must set a contract to create a payslip line." msgstr "" diff --git a/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot b/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot index c39c1f8c989..ab17966eb2e 100644 --- a/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot +++ b/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0alpha1e\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 08:37+0000\n" -"PO-Revision-Date: 2016-08-18 08:37+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,6 +20,12 @@ msgstr "" msgid "Timesheet" msgstr "" +#. module: hr_timesheet_attendance +#: model:ir.model.fields,help:hr_timesheet_attendance.field_project_config_settings_timesheet_max_difference +#: model:ir.model.fields,help:hr_timesheet_attendance.field_res_company_timesheet_max_difference +msgid "Allowed difference in hours between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control." +msgstr "" + #. module: hr_timesheet_attendance #: model:ir.model,name:hr_timesheet_attendance.model_hr_attendance #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_total_attendance @@ -130,6 +136,16 @@ msgstr "" msgid "Timesheet Activities" msgstr "" +#. module: hr_timesheet_attendance +#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_res_company_timesheet_max_difference +msgid "Timesheet allowed difference(Hours)" +msgstr "" + +#. module: hr_timesheet_attendance +#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_project_config_settings_timesheet_max_difference +msgid "Timesheet allowed difference(Hours) *" +msgstr "" + #. module: hr_timesheet_attendance #: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_by_account msgid "Timesheet by Account" @@ -227,6 +243,11 @@ msgstr "" msgid "hr.timesheet.attendance.report" msgstr "" +#. module: hr_timesheet_attendance +#: model:ir.model,name:hr_timesheet_attendance.model_project_config_settings +msgid "project.config.settings" +msgstr "" + #. module: hr_timesheet_attendance #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_pivot #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot index 0a638c45127..5368c1cce89 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -29,11 +29,6 @@ msgstr "" msgid "Add a Line" msgstr "" -#. module: hr_timesheet_sheet -#: model:ir.model.fields,help:hr_timesheet_sheet.field_res_company_timesheet_max_difference -msgid "Allowed difference in hours between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control." -msgstr "" - #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_account_analytic_line msgid "Analytic Line" @@ -55,6 +50,12 @@ msgstr "" msgid "Approved" msgstr "" +#. module: hr_timesheet_sheet +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:140 +#, python-format +msgid "Cannot approve a non-submitted timesheet." +msgstr "" + #. module: hr_timesheet_sheet #. openerp-web #: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:51 @@ -166,8 +167,8 @@ msgid "In Draft" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:104 -#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:112 +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:106 +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:116 #, python-format msgid "In order to create a timesheet for this employee, you must link him/her to a user." msgstr "" @@ -232,6 +233,18 @@ msgstr "" msgid "Note" msgstr "" +#. module: hr_timesheet_sheet +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:138 +#, python-format +msgid "Only an HR Officer or Manager can approve timesheets." +msgstr "" + +#. module: hr_timesheet_sheet +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:123 +#, python-format +msgid "Only an HR Officer or Manager can refuse timesheets or reset them to draft." +msgstr "" + #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 msgid "Open" @@ -244,6 +257,7 @@ msgid "Open Timesheet" msgstr "" #. module: hr_timesheet_sheet +#: model:ir.model.fields,help:hr_timesheet_sheet.field_project_config_settings_timesheet_range #: model:ir.model.fields,help:hr_timesheet_sheet.field_res_company_timesheet_range msgid "Periodicity on which you validate your timesheets." msgstr "" @@ -316,11 +330,6 @@ msgstr "" msgid "Timesheet Period" msgstr "" -#. module: hr_timesheet_sheet -#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_res_company_timesheet_max_difference -msgid "Timesheet allowed difference(Hours)" -msgstr "" - #. module: hr_timesheet_sheet #: model:ir.model.fields,field_description:hr_timesheet_sheet.field_project_config_settings_module_project_timesheet_synchro msgid "Timesheet app for Chrome/Android/iOS" @@ -347,6 +356,11 @@ msgstr "" msgid "Timesheet range" msgstr "" +#. module: hr_timesheet_sheet +#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_project_config_settings_timesheet_range +msgid "Timesheet range *" +msgstr "" + #. module: hr_timesheet_sheet #: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_department_timesheet_to_approve_count msgid "Timesheet to Approve" @@ -356,7 +370,6 @@ msgstr "" #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet #: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_employee_timesheet_count #: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_department_view_kanban -#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_company #: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_employee_extd_form #: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_tree_simplified #: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_config_settings_form_inherit_hr_timesheet_sheet @@ -436,19 +449,19 @@ msgid "Week" msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:133 +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:146 #, python-format msgid "Week " msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:141 +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:154 #, python-format msgid "You cannot delete a timesheet which is already confirmed." msgstr "" #. module: hr_timesheet_sheet -#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:98 +#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:100 #, python-format msgid "You cannot duplicate a timesheet." msgstr "" diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot index ae0b1fafde5..afccf9953b3 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -424,6 +424,11 @@ msgstr "" msgid "Last Week" msgstr "" +#. module: im_livechat +#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban +msgid "Leave" +msgstr "" + #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form msgid "Leave Channel" @@ -578,11 +583,6 @@ msgstr "" msgid "Percentage of happy ratings over the past 7 days" msgstr "" -#. module: im_livechat -#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban -msgid "Quit" -msgstr "" - #. module: im_livechat #: model:ir.model,name:im_livechat.model_rating_rating msgid "Rating" diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index 63d57b6c567..5c7b499ba97 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,6 +18,7 @@ msgstr "" #. module: mail #: model:mail.template,body_html:mail.mail_template_data_notification_email_default msgid "\n" +"
\n" "% if ctx.get('button_access'):\n" "
\n" "
\n" @@ -27,7 +28,7 @@ msgid "\n" "
\n" "
\n" "% endif\n" -"% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access') or ctx.get('is_accessible'):\n" +"% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access'):\n" "
\n" "
\n" "\n" @@ -98,11 +99,11 @@ msgid "\n" " using\n" " Odoo.\n" "

\n" -"" +"" msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:627 +#: code:addons/mail/models/mail_channel.py:639 #, python-format msgid " This channel is private. People must be invited to join it." msgstr "" @@ -126,13 +127,13 @@ msgid "%s (copy)" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:240 +#: code:addons/mail/models/mail_thread.py:232 #, python-format msgid "%s created" msgstr "" #. module: mail -#: code:addons/mail/models/res_users.py:80 +#: code:addons/mail/models/res_users.py:69 #, python-format msgid "%s has joined the %s network." msgstr "" @@ -151,13 +152,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:178 +#: code:addons/mail/static/src/xml/thread.xml:193 #, python-format msgid "-------- Show older messages --------" msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:631 +#: code:addons/mail/models/mail_channel.py:643 #, python-format msgid "

\n" " You can mention someone by typing @username, this will grab its attention.
\n" @@ -167,20 +168,20 @@ msgid "

\n" msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:538 +#: code:addons/mail/models/mail_channel.py:550 #, python-format msgid "
created #%s
" msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:461 -#: code:addons/mail/models/mail_channel.py:514 +#: code:addons/mail/models/mail_channel.py:473 +#: code:addons/mail/models/mail_channel.py:526 #, python-format msgid "
joined #%s
" msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:164 +#: code:addons/mail/models/mail_channel.py:169 #, python-format msgid "
left #%s
" msgstr "" @@ -263,7 +264,6 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_defaults #: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults -#: model:ir.model.fields,help:mail.field_res_users_alias_defaults msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias." msgstr "" @@ -309,6 +309,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_needaction +#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction @@ -421,17 +422,13 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_id #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_id +#: model:ir.model.fields,field_description:mail.field_mail_test_alias_id #: model:ir.model.fields,field_description:mail.field_res_users_alias_id #: model:ir.ui.view,arch_db:mail.view_mail_alias_form #: model:ir.ui.view,arch_db:mail.view_mail_alias_tree msgid "Alias" msgstr "" -#. module: mail -#: model:ir.ui.view,arch_db:mail.view_users_form_mail -msgid "Alias Accepts Emails From" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_contact @@ -449,7 +446,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_name #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_name #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_name -#: model:ir.model.fields,field_description:mail.field_res_users_alias_name msgid "Alias Name" msgstr "" @@ -457,7 +453,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_domain #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_domain #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_domain -#: model:ir.model.fields,field_description:mail.field_res_users_alias_domain msgid "Alias domain" msgstr "" @@ -465,7 +460,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_model_id #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_model_id #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_model_id -#: model:ir.model.fields,field_description:mail.field_res_users_alias_model_id msgid "Aliased Model" msgstr "" @@ -489,7 +483,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:192 +#: code:addons/mail/static/src/js/chat_manager.js:194 #, python-format msgid "Anonymous" msgstr "" @@ -537,6 +531,11 @@ msgstr "" msgid "Attachments are linked to a document through model / res_id and to the message through this field." msgstr "" +#. module: mail +#: selection:mail.alias,alias_contact:0 +msgid "Authenticated Employees" +msgstr "" + #. module: mail #: selection:mail.alias,alias_contact:0 msgid "Authenticated Partners" @@ -621,6 +620,11 @@ msgstr "" msgid "Bounce" msgstr "" +#. module: mail +#: selection:mail.notification,email_status:0 +msgid "Bounced" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/followers.js:125 @@ -757,13 +761,13 @@ msgid "Choose an example" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:346 +#: code:addons/mail/models/mail_thread.py:338 #, python-format msgid "Click here to add new %(document)s or send an email to: %(email_link)s" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:362 +#: code:addons/mail/models/mail_thread.py:354 #, python-format msgid "Click here to add new %s" msgstr "" @@ -895,6 +899,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_uid #: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_uid #: model:ir.model.fields,field_description:mail.field_mail_template_create_uid +#: model:ir.model.fields,field_description:mail.field_mail_test_create_uid #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_uid #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_uid msgid "Created by" @@ -911,6 +916,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_create_date #: model:ir.model.fields,field_description:mail.field_mail_shortcode_create_date #: model:ir.model.fields,field_description:mail.field_mail_template_create_date +#: model:ir.model.fields,field_description:mail.field_mail_test_create_date #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_create_date #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_create_date msgid "Created on" @@ -975,6 +981,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_last_post #: model:ir.model.fields,help:mail.field_mail_channel_message_last_post #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_last_post +#: model:ir.model.fields,help:mail.field_mail_test_message_last_post #: model:ir.model.fields,help:mail.field_mail_thread_message_last_post #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_last_post #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_last_post @@ -1006,6 +1013,11 @@ msgstr "" msgid "Date of the last message posted on the record." msgstr "" +#. module: mail +#: model:ir.ui.view,arch_db:mail.message_user_assigned +msgid "Dear" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default msgid "Default" @@ -1021,7 +1033,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_defaults #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_defaults #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_defaults -#: model:ir.model.fields,field_description:mail.field_res_users_alias_defaults msgid "Default Values" msgstr "" @@ -1059,7 +1070,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:167 +#: code:addons/mail/static/src/xml/thread.xml:182 #, python-format msgid "Delete this attachment" msgstr "" @@ -1114,9 +1125,11 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_followers_display_name #: model:ir.model.fields,field_description:mail.field_mail_mail_display_name #: model:ir.model.fields,field_description:mail.field_mail_message_display_name +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_display_name #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_display_name #: model:ir.model.fields,field_description:mail.field_mail_shortcode_display_name #: model:ir.model.fields,field_description:mail.field_mail_template_display_name +#: model:ir.model.fields,field_description:mail.field_mail_test_display_name #: model:ir.model.fields,field_description:mail.field_mail_thread_display_name #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_display_name #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_display_name @@ -1199,6 +1212,11 @@ msgstr "" msgid "Email Search" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_email_status +msgid "Email Status" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id msgid "Email Template" @@ -1262,7 +1280,7 @@ msgid "Error during communication with the publisher warranty server." msgstr "" #. module: mail -#: code:addons/mail/models/mail_mail.py:239 +#: code:addons/mail/models/mail_mail.py:252 #, python-format msgid "Error without exception. Probably due do sending an email without computed recipients." msgstr "" @@ -1288,6 +1306,11 @@ msgstr "" msgid "Everyone" msgstr "" +#. module: mail +#: selection:mail.notification,email_status:0 +msgid "Exception" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search msgid "Extended Filters..." @@ -1362,7 +1385,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:666 +#: code:addons/mail/models/mail_thread.py:658 #: code:addons/mail/static/src/xml/followers.xml:21 #, python-format msgid "Follow" @@ -1401,6 +1424,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_follower_ids #: model:ir.model.fields,field_description:mail.field_mail_channel_message_follower_ids #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_follower_ids +#: model:ir.model.fields,field_description:mail.field_mail_test_message_follower_ids #: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids @@ -1466,6 +1490,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_channel_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_channel_ids +#: model:ir.model.fields,field_description:mail.field_mail_test_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids @@ -1529,6 +1554,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_channel_message_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_partner_ids +#: model:ir.model.fields,field_description:mail.field_mail_test_message_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids @@ -1594,7 +1620,7 @@ msgid "Gateway" msgstr "" #. module: mail -#: code:addons/mail/models/res_users.py:50 +#: code:addons/mail/models/res_users.py:46 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -1646,9 +1672,11 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_followers_id #: model:ir.model.fields,field_description:mail.field_mail_mail_id #: model:ir.model.fields,field_description:mail.field_mail_message_id +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_id #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id #: model:ir.model.fields,field_description:mail.field_mail_shortcode_id #: model:ir.model.fields,field_description:mail.field_mail_template_id +#: model:ir.model.fields,field_description:mail.field_mail_test_id #: model:ir.model.fields,field_description:mail.field_mail_thread_id #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_id #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_id @@ -1660,7 +1688,6 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_alias_alias_parent_thread_id #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_parent_thread_id #: model:ir.model.fields,help:mail.field_mail_channel_alias_parent_thread_id -#: model:ir.model.fields,help:mail.field_res_users_alias_parent_thread_id msgid "ID of the parent record holding the alias (example: project holding the task creation alias)" msgstr "" @@ -1709,6 +1736,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_unread #: model:ir.model.fields,help:mail.field_mail_channel_message_unread #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_unread +#: model:ir.model.fields,help:mail.field_mail_test_message_unread #: model:ir.model.fields,help:mail.field_mail_thread_message_unread #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread @@ -1772,6 +1800,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_needaction #: model:ir.model.fields,help:mail.field_mail_channel_message_needaction #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_needaction +#: model:ir.model.fields,help:mail.field_mail_test_message_needaction #: model:ir.model.fields,help:mail.field_mail_thread_message_needaction #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction @@ -1844,7 +1873,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:1008 +#: code:addons/mail/static/src/js/chat_manager.js:1026 #: code:addons/mail/static/src/xml/client_action.xml:22 #: code:addons/mail/static/src/xml/systray.xml:6 #, python-format @@ -1871,14 +1900,14 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1703 +#: code:addons/mail/models/mail_thread.py:1746 #, python-format msgid "Invalid record set: should be called as model (without records) or on single-record recordset" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:601 +#: code:addons/mail/static/src/js/chat_manager.js:619 #, python-format msgid "Invitation" msgstr "" @@ -1914,7 +1943,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:648 +#: code:addons/mail/static/src/js/client_action.js:649 #, python-format msgid "Invite people to #%s" msgstr "" @@ -1961,6 +1990,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_is_follower #: model:ir.model.fields,field_description:mail.field_mail_channel_message_is_follower #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_is_follower +#: model:ir.model.fields,field_description:mail.field_mail_test_message_is_follower #: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower @@ -1997,6 +2027,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_read +msgid "Is Read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed msgid "Is Subscribed" @@ -2060,6 +2095,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_last_post #: model:ir.model.fields,field_description:mail.field_mail_channel_message_last_post #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_last_post +#: model:ir.model.fields,field_description:mail.field_mail_test_message_last_post #: model:ir.model.fields,field_description:mail.field_mail_thread_message_last_post #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_last_post #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_last_post @@ -2101,9 +2137,11 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_followers___last_update #: model:ir.model.fields,field_description:mail.field_mail_mail___last_update #: model:ir.model.fields,field_description:mail.field_mail_message___last_update +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel___last_update #: model:ir.model.fields,field_description:mail.field_mail_message_subtype___last_update #: model:ir.model.fields,field_description:mail.field_mail_shortcode___last_update #: model:ir.model.fields,field_description:mail.field_mail_template___last_update +#: model:ir.model.fields,field_description:mail.field_mail_test___last_update #: model:ir.model.fields,field_description:mail.field_mail_thread___last_update #: model:ir.model.fields,field_description:mail.field_mail_tracking_value___last_update #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite___last_update @@ -2134,6 +2172,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_message_write_uid #: model:ir.model.fields,field_description:mail.field_mail_shortcode_write_uid #: model:ir.model.fields,field_description:mail.field_mail_template_write_uid +#: model:ir.model.fields,field_description:mail.field_mail_test_write_uid #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_uid #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_uid msgid "Last Updated by" @@ -2151,6 +2190,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_message_write_date #: model:ir.model.fields,field_description:mail.field_mail_shortcode_write_date #: model:ir.model.fields,field_description:mail.field_mail_template_write_date +#: model:ir.model.fields,field_description:mail.field_mail_test_write_date #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_write_date #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_write_date msgid "Last Updated on" @@ -2163,7 +2203,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_channel.py:640 +#: code:addons/mail/models/mail_channel.py:652 #: code:addons/mail/static/src/xml/client_action.xml:101 #, python-format msgid "Leave this channel" @@ -2180,7 +2220,7 @@ msgid "List of partners that will be added as follower of the current document." msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:651 +#: code:addons/mail/models/mail_channel.py:663 #, python-format msgid "List users in the current channel" msgstr "" @@ -2241,7 +2281,7 @@ msgid "Mail Channel Form" msgstr "" #. module: mail -#: code:addons/mail/models/mail_mail.py:305 +#: code:addons/mail/models/mail_mail.py:318 #, python-format msgid "Mail Delivery Failed" msgstr "" @@ -2277,7 +2317,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:106 +#: code:addons/mail/static/src/xml/thread.xml:121 #, python-format msgid "Mark as Read" msgstr "" @@ -2285,7 +2325,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/thread.xml:68 -#: code:addons/mail/static/src/xml/thread.xml:100 +#: code:addons/mail/static/src/xml/thread.xml:115 #, python-format msgid "Mark as Todo" msgstr "" @@ -2313,6 +2353,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_mail_message_id #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_message #: model:ir.ui.view,arch_db:mail.view_message_form msgid "Message" @@ -2323,6 +2364,11 @@ msgstr "" msgid "Message ID" msgstr "" +#. module: mail +#: model:ir.model,name:mail.model_mail_notification +msgid "Message Notifications" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_record_name #: model:ir.model.fields,field_description:mail.field_mail_mail_record_name @@ -2425,6 +2471,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_ids #: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_ids +#: model:ir.model.fields,field_description:mail.field_mail_test_message_ids #: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids @@ -2475,11 +2522,6 @@ msgstr "" msgid "Messages with internal subtypes will be visible only by employees, aka members of base_user group" msgstr "" -#. module: mail -#: model:ir.ui.view,arch_db:mail.view_users_form_mail -msgid "Messaging Alias" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_res_model #: model:ir.ui.view,arch_db:mail.view_email_template_search @@ -2507,6 +2549,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_email_template_preview_name #: model:ir.model.fields,field_description:mail.field_mail_channel_name #: model:ir.model.fields,field_description:mail.field_mail_template_name +#: model:ir.model.fields,field_description:mail.field_mail_test_name #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Name" msgstr "" @@ -2539,6 +2582,11 @@ msgstr "" msgid "Need Action" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_res_partner_id +msgid "Needaction Recipient" +msgstr "" + #. module: mail #: selection:res.partner,notify_email:0 msgid "Never" @@ -2586,7 +2634,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:131 +#: code:addons/mail/static/src/xml/thread.xml:146 #, python-format msgid "New messages" msgstr "" @@ -2658,6 +2706,14 @@ msgstr "" msgid "Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids +#: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids +#: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids +#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notification_ids +msgid "Notifications" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify #: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notify @@ -2702,6 +2758,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_needaction_counter +#: model:ir.model.fields,field_description:mail.field_mail_test_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter @@ -2765,6 +2822,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_needaction_counter #: model:ir.model.fields,help:mail.field_mail_channel_message_needaction_counter #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_needaction_counter +#: model:ir.model.fields,help:mail.field_mail_test_message_needaction_counter #: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter @@ -2828,6 +2886,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_unread_counter #: model:ir.model.fields,help:mail.field_mail_channel_message_unread_counter #: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_unread_counter +#: model:ir.model.fields,help:mail.field_mail_test_message_unread_counter #: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter #: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter #: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter @@ -2859,6 +2918,11 @@ msgstr "" msgid "Number of unread messages" msgstr "" +#. module: mail +#: model:ir.ui.view,arch_db:mail.message_user_assigned +msgid "Odoo" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:11 @@ -2963,7 +3027,6 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_alias_alias_force_thread_id #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_force_thread_id #: model:ir.model.fields,help:mail.field_mail_channel_alias_force_thread_id -#: model:ir.model.fields,help:mail.field_res_users_alias_force_thread_id msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely." msgstr "" @@ -3025,7 +3088,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_user_id #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_user_id #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_user_id -#: model:ir.model.fields,field_description:mail.field_res_users_alias_user_id msgid "Owner" msgstr "" @@ -3046,7 +3108,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_parent_model_id #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_parent_model_id #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_parent_model_id -#: model:ir.model.fields,field_description:mail.field_res_users_alias_parent_model_id msgid "Parent Model" msgstr "" @@ -3054,7 +3115,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_parent_thread_id #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_parent_thread_id #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_parent_thread_id -#: model:ir.model.fields,field_description:mail.field_res_users_alias_parent_thread_id msgid "Parent Record Thread ID" msgstr "" @@ -3062,7 +3122,6 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_alias_alias_parent_model_id #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_parent_model_id #: model:ir.model.fields,help:mail.field_mail_channel_alias_parent_model_id -#: model:ir.model.fields,help:mail.field_res_users_alias_parent_model_id msgid "Parent model holding the alias. The model holding the alias reference is not necessarily the model given by alias_model_id (example: project (parent_model) and task (model))" msgstr "" @@ -3076,6 +3135,11 @@ msgstr "" msgid "Partner" msgstr "" +#. module: mail +#: model:ir.actions.act_window,name:mail.action_partner_mass_mail +msgid "Partner Mass Mailing" +msgstr "" + #. module: mail #: code:addons/mail/models/res_partner.py:39 #, python-format @@ -3159,6 +3223,11 @@ msgid "Policy to receive emails for new messages pushed to your personal Inbox:\ "- All Messages: for every notification you receive in your Inbox" msgstr "" +#. module: mail +#: model:ir.ui.view,arch_db:mail.message_user_assigned +msgid "Powered by" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Preferred reply address" @@ -3206,6 +3275,11 @@ msgstr "" msgid "Re:" msgstr "" +#. module: mail +#: selection:mail.notification,email_status:0 +msgid "Ready to Send" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search #: selection:mail.mail,state:0 @@ -3231,7 +3305,6 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_force_thread_id #: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_force_thread_id #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_force_thread_id -#: model:ir.model.fields,field_description:mail.field_res_users_alias_force_thread_id msgid "Record Thread ID" msgstr "" @@ -3291,7 +3364,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:103 +#: code:addons/mail/static/src/xml/thread.xml:118 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "Reply" @@ -3337,6 +3410,12 @@ msgstr "" msgid "Rich-text/HTML message" msgstr "" +#. module: mail +#: code:addons/mail/models/mail_thread.py:795 +#, python-format +msgid "Routing mail with Message-Id %s: route %s: %s" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_email_template_search msgid "SMTP Server" @@ -3359,7 +3438,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_window.js:35 +#: code:addons/mail/static/src/js/chat_window.js:36 #, python-format msgid "Say something" msgstr "" @@ -3452,9 +3531,15 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search #: selection:mail.mail,state:0 +#: selection:mail.notification,email_status:0 msgid "Sent" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_message_res_partner_needaction_rel_is_email +msgid "Sent by Email" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_sequence msgid "Sequence" @@ -3484,7 +3569,7 @@ msgid "Shortcut" msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:620 +#: code:addons/mail/models/mail_channel.py:632 #, python-format msgid "Show an helper message" msgstr "" @@ -3538,7 +3623,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:1014 +#: code:addons/mail/static/src/js/chat_manager.js:1032 #: code:addons/mail/static/src/xml/client_action.xml:28 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred #: model:ir.model.fields,field_description:mail.field_mail_mail_starred @@ -3596,7 +3681,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:115 +#: code:addons/mail/static/src/xml/thread.xml:130 #, python-format msgid "Subject:" msgstr "" @@ -3610,7 +3695,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id #: model:ir.model.fields,field_description:mail.field_mail_followers_subtype_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_subtype_id -#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2118 +#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2098 #: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id #: model:ir.ui.view,arch_db:mail.view_message_subtype_tree msgid "Subtype" @@ -3643,6 +3728,11 @@ msgstr "" msgid "Templates" msgstr "" +#. module: mail +#: model:ir.model,name:mail.model_mail_test +msgid "Test Mail Model" +msgstr "" + #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_alias_id msgid "The email address associated with this group. New emails received will automatically create new topics." @@ -3657,7 +3747,6 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_alias_alias_model_id #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_model_id #: model:ir.model.fields,help:mail.field_mail_channel_alias_model_id -#: model:ir.model.fields,help:mail.field_res_users_alias_model_id msgid "The model (Odoo Document Kind) to which this alias corresponds. Any incoming email that does not reply to an existing record will cause the creation of a new record of this model (e.g. a Project Task)" msgstr "" @@ -3665,7 +3754,6 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_alias_alias_name #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_name #: model:ir.model.fields,help:mail.field_mail_channel_alias_name -#: model:ir.model.fields,help:mail.field_res_users_alias_name msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for " msgstr "" @@ -3673,13 +3761,12 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_alias_alias_user_id #: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_user_id #: model:ir.model.fields,help:mail.field_mail_channel_alias_user_id -#: model:ir.model.fields,help:mail.field_res_users_alias_user_id msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address." msgstr "" #. module: mail -#: code:addons/mail/models/mail_message.py:555 -#: code:addons/mail/models/mail_message.py:650 +#: code:addons/mail/models/mail_message.py:574 +#: code:addons/mail/models/mail_message.py:669 #, python-format msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n" "\n" @@ -3759,7 +3846,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:230 +#: code:addons/mail/static/src/js/thread.js:231 #, python-format msgid "Today" msgstr "" @@ -3823,9 +3910,9 @@ msgid "UUID" msgstr "" #. module: mail -#: code:addons/mail/models/mail_message.py:44 +#: code:addons/mail/models/mail_message.py:31 #, python-format -msgid "Unable to send email, please configure the sender's email address or alias." +msgid "Unable to send email, please configure the sender's email address." msgstr "" #. module: mail @@ -3837,7 +3924,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:667 +#: code:addons/mail/models/mail_thread.py:659 #: code:addons/mail/static/src/xml/followers.xml:23 #, python-format msgid "Unfollow" @@ -3880,6 +3967,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_unread #: model:ir.model.fields,field_description:mail.field_mail_channel_message_unread #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_unread +#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread #: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread @@ -3943,6 +4031,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_unread_counter #: model:ir.model.fields,field_description:mail.field_mail_channel_message_unread_counter #: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_unread_counter +#: model:ir.model.fields,field_description:mail.field_mail_test_message_unread_counter #: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter @@ -4009,7 +4098,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:169 +#: code:addons/mail/static/src/xml/thread.xml:184 #, python-format msgid "Uploading" msgstr "" @@ -4051,14 +4140,15 @@ msgid "Users" msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:664 +#: code:addons/mail/models/mail_channel.py:676 #, python-format msgid "Users in this channel: %s %s and you." msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:654 -#: code:addons/mail/models/mail_thread.py:656 +#: code:addons/mail/models/mail_thread.py:646 +#: code:addons/mail/models/mail_thread.py:648 +#: model:ir.ui.view,arch_db:mail.message_user_assigned #, python-format msgid "View" msgstr "" @@ -4103,7 +4193,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:232 +#: code:addons/mail/static/src/js/thread.js:233 #, python-format msgid "Yesterday" msgstr "" @@ -4116,19 +4206,19 @@ msgid "You added %s to the conversation." msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:661 +#: code:addons/mail/models/mail_channel.py:673 #, python-format msgid "You are alone in this channel." msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:630 +#: code:addons/mail/models/mail_channel.py:642 #, python-format msgid "You are in a private conversation with @%s." msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:625 +#: code:addons/mail/models/mail_channel.py:637 #, python-format msgid "You are in channel #%s." msgstr "" @@ -4141,27 +4231,32 @@ msgid "You can mark any message as 'starred', and it shows up in this channel." msgstr "" #. module: mail -#: code:addons/mail/models/res_users.py:49 +#: code:addons/mail/models/res_users.py:45 #, python-format msgid "You cannot create a new user from here.\n" " To create new user please go to configuration panel." msgstr "" #. module: mail -#: code:addons/mail/models/mail_channel.py:132 +#: code:addons/mail/models/mail_channel.py:134 #, python-format msgid "You cannot delete those groups, as the Whole Company group is required by other modules." msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:353 +#: code:addons/mail/models/mail_thread.py:345 #, python-format msgid "You could also add a new %(document)s by sending an email to: %(email_link)s." msgstr "" +#. module: mail +#: model:ir.ui.view,arch_db:mail.message_user_assigned +msgid "You have been assigned to the" +msgstr "" + #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:601 +#: code:addons/mail/static/src/js/chat_manager.js:619 #, python-format msgid "You have been invited to: " msgstr "" @@ -4174,14 +4269,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:497 +#: code:addons/mail/static/src/js/chat_manager.js:515 #, python-format msgid "You unpinned your conversation with %s." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:495 +#: code:addons/mail/static/src/js/chat_manager.js:513 #, python-format msgid "You unsubscribed from %s." msgstr "" @@ -4197,6 +4292,18 @@ msgstr "" msgid "Your template should define email_from" msgstr "" +#. module: mail +#: code:addons/mail/models/mail_thread.py:929 +#, python-format +msgid "alias %s does not accept unknown author" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_thread.py:925 +#, python-format +msgid "alias %s restricted to internal followers" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_base_config_settings msgid "base.config.settings" @@ -4213,7 +4320,7 @@ msgid "created" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:319 +#: code:addons/mail/models/mail_thread.py:311 #, python-format msgid "document" msgstr "" @@ -4274,6 +4381,24 @@ msgstr "" msgid "mention(s) marked as read." msgstr "" +#. module: mail +#: code:addons/mail/models/mail_thread.py:904 +#, python-format +msgid "model %s does not accept document creation" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_thread.py:899 +#, python-format +msgid "model %s does not accept document update" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_thread.py:892 +#, python-format +msgid "model %s does not accept document update, fall back on document creation" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.message_origin_link msgid "modified" @@ -4299,6 +4424,18 @@ msgstr "" msgid "on" msgstr "" +#. module: mail +#: code:addons/mail/models/mail_thread.py:874 +#, python-format +msgid "posting a message without model should be with a null res_id (private message), received %s" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_thread.py:878 +#, python-format +msgid "posting a message without model should be with a parent_id (private message)" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_publisher_warranty_contract msgid "publisher_warranty.contract" @@ -4323,6 +4460,35 @@ msgstr "" msgid "record:" msgstr "" +#. module: mail +#: code:addons/mail/models/mail_thread.py:896 +#, python-format +msgid "reply to missing document (%s,%s)" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_thread.py:889 +#, python-format +msgid "reply to missing document (%s,%s), fall back on new document creation" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_thread.py:874 +#, python-format +msgid "resetting thread_id" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_thread.py:878 +#: code:addons/mail/models/mail_thread.py:896 +#: code:addons/mail/models/mail_thread.py:899 +#: code:addons/mail/models/mail_thread.py:904 +#: code:addons/mail/models/mail_thread.py:925 +#: code:addons/mail/models/mail_thread.py:929 +#, python-format +msgid "skipping" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:25 @@ -4330,3 +4496,9 @@ msgstr "" msgid "this document" msgstr "" +#. module: mail +#: code:addons/mail/models/mail_thread.py:867 +#, python-format +msgid "unknown target model %s" +msgstr "" + diff --git a/addons/maintenance/i18n/maintenance.pot b/addons/maintenance/i18n/maintenance.pot index 41f9073d994..7acc5dffe42 100644 --- a/addons/maintenance/i18n/maintenance.pot +++ b/addons/maintenance/i18n/maintenance.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0alpha1e\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 08:38+0000\n" -"PO-Revision-Date: 2016-08-18 08:38+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -357,10 +357,15 @@ msgid "Equipment Categories" msgstr "" #. module: maintenance -#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3386 +#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3424 msgid "Equipment Category" msgstr "" +#. module: maintenance +#: model:res.groups,name:maintenance.group_equipment_manager +msgid "Equipment Manager" +msgstr "" + #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_name #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form @@ -893,6 +898,11 @@ msgstr "" msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address." msgstr "" +#. module: maintenance +#: model:res.groups,comment:maintenance.group_equipment_manager +msgid "The user will be able to manage equipments." +msgstr "" + #. module: maintenance #: model:ir.actions.act_window,help:maintenance.hr_equipment_action msgid "This application helps you to track equipments used by employees.\n" diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot index 78a55bcc94a..f09d49fae08 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "%
\n" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:452 +#: code:addons/mass_mailing/models/mass_mailing.py:431 #, python-format msgid "%s (copy)" msgstr "" @@ -75,15 +75,9 @@ msgstr "" #. module: mass_mailing #: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1 -msgid "
\n" -"

Odoo Presents

\n" -"
\n" -"
\n" -" 7\n" +msgid "7\n" " Business Hacks\n" -" to
boost your marketing\n" -"
\n" -"

Join our Marketing newsletter and get this white paper instantly

" +" to
boost your marketing" msgstr "" #. module: mass_mailing @@ -150,11 +144,6 @@ msgstr "" msgid "Active" msgstr "" -#. module: mass_mailing -#: selection:mass.mailing.config.settings,group_website_popup_on_exit:0 -msgid "Allow the use of a pop-up snippet on website to encourage visitors to sign up on a mass mailing list" -msgstr "" - #. module: mass_mailing #: selection:mass.mailing.config.settings,group_mass_mailing_campaign:0 msgid "Allow using marketing campaigns (advanced)" @@ -239,7 +228,7 @@ msgid "Bounced ratio" msgstr "" #. module: mass_mailing -#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3637 +#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3673 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form msgid "Campaign" msgstr "" @@ -515,11 +504,6 @@ msgstr "" msgid "Display Name" msgstr "" -#. module: mass_mailing -#: selection:mass.mailing.config.settings,group_website_popup_on_exit:0 -msgid "Do not add extra content on website pages to encourage visitors to sign up" -msgstr "" - #. module: mass_mailing #: selection:mass.mailing.config.settings,group_mass_mailing_campaign:0 msgid "Do not organize and schedule mail campaigns (easy)" @@ -541,7 +525,7 @@ msgid "Domain" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:460 +#: code:addons/mass_mailing/models/mass_mailing.py:439 #: selection:mail.mass_mailing,state:0 #: selection:mail.statistics.report,state:0 #, python-format @@ -716,7 +700,7 @@ msgid "If checked, recipients will be mailed only once, allowing to send various msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:460 +#: code:addons/mass_mailing/models/mass_mailing.py:439 #: selection:mail.mass_mailing,state:0 #, python-format msgid "In Queue" @@ -732,6 +716,11 @@ msgstr "" msgid "Job Position" msgstr "" +#. module: mass_mailing +#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1 +msgid "Join our Marketing newsletter and get this white paper instantly" +msgstr "" + #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_keep_archives msgid "Keep Archives" @@ -851,7 +840,7 @@ msgid "Mailing" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:304 +#: code:addons/mass_mailing/models/mass_mailing.py:283 #: model:ir.model,name:mass_mailing.model_mail_mass_mailing_list #: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message_mailing_list_ids #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_id @@ -1099,6 +1088,11 @@ msgstr "" msgid "Number of clicks" msgstr "" +#. module: mass_mailing +#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1 +msgid "Odoo Presents" +msgstr "" + #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search msgid "Open Date" @@ -1154,16 +1148,11 @@ msgid "Percentage of the contacts that will be mailed. Recipients will be taken msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:578 +#: code:addons/mass_mailing/models/mass_mailing.py:557 #, python-format msgid "Please select recipients." msgstr "" -#. module: mass_mailing -#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_form -msgid "Popup Content" -msgstr "" - #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_reply_to msgid "Preferred Reply-To Address" @@ -1354,14 +1343,14 @@ msgid "Send to All" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:460 +#: code:addons/mass_mailing/models/mass_mailing.py:439 #: selection:mail.mass_mailing,state:0 #, python-format msgid "Sending" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:460 +#: code:addons/mass_mailing/models/mass_mailing.py:439 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_sent #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_sent #: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_sent @@ -1499,7 +1488,12 @@ msgid "Templates" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:515 +#: model:ir.model,name:mass_mailing.model_mail_test +msgid "Test Mail Model" +msgstr "" + +#. module: mass_mailing +#: code:addons/mass_mailing/models/mass_mailing.py:494 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form #, python-format msgid "Test Mailing" @@ -1538,7 +1532,7 @@ msgstr "" #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_campaign_id -#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3637 +#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3673 msgid "This name helps you tracking your different campaign efforts, e.g. Fall_Drive, Christmas_Special" msgstr "" @@ -1578,11 +1572,6 @@ msgstr "" msgid "Unsubscription Date" msgstr "" -#. module: mass_mailing -#: model:res.groups,name:mass_mailing.group_website_popup_on_exit -msgid "Use subscription pop up on the website" -msgstr "" - #. module: mass_mailing #: model:res.groups,name:mass_mailing.group_mass_mailing_user msgid "User" @@ -1598,21 +1587,6 @@ msgstr "" msgid "We would like you to know that your order has shipped! To track your order or make any changes please click the \"my order\" button below." msgstr "" -#. module: mass_mailing -#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_group_website_popup_on_exit -msgid "Website Pop-up" -msgstr "" - -#. module: mass_mailing -#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_popup_content -msgid "Website Popup Content" -msgstr "" - -#. module: mass_mailing -#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_popup_redirect_url -msgid "Website Popup Redirect URL" -msgstr "" - #. module: mass_mailing #: code:addons/mass_mailing/controllers/main.py:26 #, python-format diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot index 9fc5b480651..b1311f294bb 100644 --- a/addons/membership/i18n/membership.pot +++ b/addons/membership/i18n/membership.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -121,6 +121,11 @@ msgstr "" msgid "Company" msgstr "" +#. module: membership +#: model:ir.ui.menu,name:membership.menu_marketing_config_association +msgid "Configuration" +msgstr "" + #. module: membership #: model:ir.ui.view,arch_db:membership.view_partner_tree msgid "Contacts" @@ -357,6 +362,7 @@ msgstr "" #. module: membership #: model:ir.actions.act_window,name:membership.action_membership_members +#: model:ir.ui.menu,name:membership.menu_association #: model:ir.ui.menu,name:membership.menu_membership #: model:ir.ui.view,arch_db:membership.membership_members_tree msgid "Members" @@ -502,13 +508,13 @@ msgid "Partner" msgstr "" #. module: membership -#: code:addons/membership/models/partner.py:182 +#: code:addons/membership/models/partner.py:181 #, python-format msgid "Partner doesn't have an address to make the invoice." msgstr "" #. module: membership -#: code:addons/membership/models/partner.py:180 +#: code:addons/membership/models/partner.py:179 #, python-format msgid "Partner is a free Member." msgstr "" diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot index 91958e313f3..fc0c02a0959 100644 --- a/addons/mrp/i18n/mrp.pot +++ b/addons/mrp/i18n/mrp.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgid "# Work Orders" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_bom.py:262 +#: code:addons/mrp/models/mrp_bom.py:261 #, python-format msgid "

\n" " Click to upload files to your product.\n" @@ -126,6 +126,11 @@ msgstr "" msgid "Work Orders" msgstr "" +#. module: mrp +#: model:ir.ui.view,arch_db:mrp.report_mrporder +msgid "Barcode" +msgstr "" + #. module: mrp #: model:ir.ui.view,arch_db:mrp.report_mrporder msgid "Destination Location" @@ -207,7 +212,7 @@ msgid "WorkCenter" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:418 +#: code:addons/mrp/models/mrp_workorder.py:419 #, python-format msgid "A Manufacturing Order is already done or cancelled!" msgstr "" @@ -278,7 +283,7 @@ msgid "Archived" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_bom.py:254 +#: code:addons/mrp/models/mrp_bom.py:253 #, python-format msgid "Attachments" msgstr "" @@ -363,6 +368,11 @@ msgstr "" msgid "Bill of Material" msgstr "" +#. module: mrp +#: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form +msgid "Bill of Material line" +msgstr "" + #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action #: model:ir.actions.act_window,name:mrp.product_open_bom @@ -447,6 +457,11 @@ msgstr "" msgid "BoM Type" msgstr "" +#. module: mrp +#: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form +msgid "BoM details" +msgstr "" + #. module: mrp #: code:addons/mrp/models/mrp_bom.py:67 #, python-format @@ -486,7 +501,7 @@ msgid "Cancelled" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:258 +#: code:addons/mrp/models/mrp_production.py:260 #, python-format msgid "Cannot delete a manufacturing order not in cancel state" msgstr "" @@ -588,6 +603,7 @@ msgstr "" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_bom_company_id +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_company_id #: model:ir.model.fields,field_description:mrp.field_mrp_production_company_id #: model:ir.model.fields,field_description:mrp.field_mrp_routing_company_id #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_company_id @@ -1175,6 +1191,11 @@ msgstr "" msgid "Keep empty if you produce at the location where you find the raw materials.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations." msgstr "" +#. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter +msgid "Kit" +msgstr "" + #. module: mrp #: model:ir.model.fields,help:mrp.field_mrp_bom_type msgid "Kit (Phantom): When processing a sales order for this product, the delivery order will contain the raw materials, instead of the finished product." @@ -1270,7 +1291,12 @@ msgid "Location where the system will stock the finished products." msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9320 +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Logistics" +msgstr "" + +#. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9364 #: model:ir.ui.view,arch_db:mrp.oee_search_view msgid "Loss Reason" msgstr "" @@ -1284,6 +1310,7 @@ msgid "Lot" msgstr "" #. module: mrp +#: model:ir.model.fields,field_description:mrp.field_stock_move_active_move_lot_ids #: model:ir.model.fields,field_description:mrp.field_stock_move_move_lot_ids #: model:ir.ui.view,arch_db:mrp.view_stock_move_lots msgid "Lots" @@ -1359,6 +1386,7 @@ msgstr "" #. module: mrp #: code:addons/mrp/models/stock_warehouse.py:64 +#: model:ir.ui.menu,name:mrp.menu_mrp_root #: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button #: model:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button #: model:stock.picking.type,name:mrp.picking_type_manufacturing @@ -1373,6 +1401,11 @@ msgstr "" msgid "Manufacturing Lead Time" msgstr "" +#. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_manufacturing_lead +msgid "Manufacturing Lead Time *" +msgstr "" + #. module: mrp #: model:ir.model.fields,field_description:mrp.field_change_production_qty_mo_id #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_mo_id @@ -1385,7 +1418,7 @@ msgid "Manufacturing Order" msgstr "" #. module: mrp -#: code:addons/mrp/models/procurement.py:88 +#: code:addons/mrp/models/procurement.py:87 #, python-format msgid "Manufacturing Order %s created." msgstr "" @@ -1466,7 +1499,7 @@ msgstr "" #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_message_action_main -msgid "Messages can be configurred to appear during any operation: receptions, delivery orders,\n" +msgid "Messages can be configured to appear during any operation: receptions, delivery orders,\n" " manufacturing orders, work orders, etc." msgstr "" @@ -1522,12 +1555,12 @@ msgstr "" #. module: mrp #: code:addons/mrp/models/mrp_production.py:46 -#: code:addons/mrp/models/mrp_production.py:248 +#: code:addons/mrp/models/mrp_production.py:250 #: code:addons/mrp/models/mrp_routing.py:18 #: code:addons/mrp/models/mrp_routing.py:34 #: code:addons/mrp/models/mrp_routing.py:35 #: code:addons/mrp/models/mrp_unbuild.py:20 -#: code:addons/mrp/models/mrp_unbuild.py:80 +#: code:addons/mrp/models/mrp_unbuild.py:81 #, python-format msgid "New" msgstr "" @@ -1543,7 +1576,7 @@ msgid "Next Work Order" msgstr "" #. module: mrp -#: code:addons/mrp/models/procurement.py:91 +#: code:addons/mrp/models/procurement.py:90 #, python-format msgid "No BoM exists for this product!" msgstr "" @@ -1612,6 +1645,8 @@ msgstr "" #. module: mrp #: selection:ir.attachment,priority:0 +#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter +#: selection:mrp.production,priority:0 #: selection:mrp.workcenter,working_state:0 msgid "Normal" msgstr "" @@ -1621,6 +1656,11 @@ msgstr "" msgid "Not to restrict or prefer quants, but informative." msgstr "" +#. module: mrp +#: selection:mrp.production,priority:0 +msgid "Not urgent" +msgstr "" + #. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view msgid "Notes" @@ -1800,7 +1840,7 @@ msgid "Planned Date" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:263 +#: code:addons/mrp/models/mrp_workorder.py:264 #, python-format msgid "Please set the quantity you produced in the Current Qty field. It can not be 0!" msgstr "" @@ -1822,6 +1862,7 @@ msgstr "" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_ir_attachment_priority +#: model:ir.model.fields,field_description:mrp.field_mrp_production_priority msgid "Priority" msgstr "" @@ -1873,6 +1914,7 @@ msgstr "" #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_id #: model:ir.model.fields,field_description:mrp.field_stock_move_consume_product_id #: model:ir.model.fields,field_description:mrp.field_stock_move_lots_product_id +#: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form #: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view #: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter #: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter @@ -2046,6 +2088,7 @@ msgstr "" #: model:ir.model.fields,field_description:mrp.field_stock_move_quantity_done_store #: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report #: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view +#: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form #: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report #: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view msgid "Quantity" @@ -2153,7 +2196,7 @@ msgid "Reference of the document that generated this production order request." msgstr "" #. module: mrp -#: code:addons/mrp/models/stock_move.py:237 +#: code:addons/mrp/models/stock_move.py:242 #, python-format msgid "Register Lots" msgstr "" @@ -2288,8 +2331,8 @@ msgid "Scheduled Month" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:520 -#: code:addons/mrp/models/mrp_workorder.py:427 +#: code:addons/mrp/models/mrp_production.py:534 +#: code:addons/mrp/models/mrp_workorder.py:428 #: model:ir.ui.menu,name:mrp.menu_mrp_scrap #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view #: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit @@ -2345,6 +2388,7 @@ msgid "Search for mrp workcenter" msgstr "" #. module: mrp +#: model:ir.model.fields,help:mrp.field_mrp_config_settings_manufacturing_lead #: model:ir.model.fields,help:mrp.field_res_company_manufacturing_lead msgid "Security days for each manufacturing operation." msgstr "" @@ -2364,6 +2408,7 @@ msgid "Set duration manually" msgstr "" #. module: mrp +#: model:ir.ui.menu,name:mrp.menu_mrp_config #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban msgid "Settings" @@ -2375,7 +2420,7 @@ msgid "Ship this product as a set of components (kit)" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_unbuild.py:88 +#: code:addons/mrp/models/mrp_unbuild.py:89 #, python-format msgid "Should have a lot for the finished product" msgstr "" @@ -2502,7 +2547,7 @@ msgstr "" #. module: mrp #: code:addons/mrp/models/mrp_bom.py:76 -#: code:addons/mrp/models/mrp_bom.py:223 +#: code:addons/mrp/models/mrp_bom.py:222 #, python-format msgid "The Product Unit of Measure you chose has a different category than in the product form." msgstr "" @@ -2586,7 +2631,7 @@ msgid "Time Tracking" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:354 +#: code:addons/mrp/models/mrp_workorder.py:355 #, python-format msgid "Time Tracking: " msgstr "" @@ -2697,6 +2742,7 @@ msgstr "" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_tracking +#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_has_tracking #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_tracking msgid "Tracking" msgstr "" @@ -2719,7 +2765,7 @@ msgid "Unbuild Order" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_unbuild.py:75 +#: code:addons/mrp/models/mrp_unbuild.py:76 #, python-format msgid "Unbuild Order product quantity has to be strictly positive." msgstr "" @@ -2765,6 +2811,11 @@ msgstr "" msgid "Update" msgstr "" +#. module: mrp +#: selection:mrp.production,priority:0 +msgid "Urgent" +msgstr "" + #. module: mrp #: selection:mrp.config.settings,module_mrp_mps:0 msgid "Use Master Production Schedule in order to create procurements based on forecasts" @@ -2806,6 +2857,11 @@ msgstr "" msgid "Very High" msgstr "" +#. module: mrp +#: selection:mrp.production,priority:0 +msgid "Very Urgent" +msgstr "" + #. module: mrp #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban #: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter @@ -2837,7 +2893,7 @@ msgstr "" #. module: mrp #: code:addons/mrp/models/mrp_bom.py:76 -#: code:addons/mrp/models/mrp_bom.py:223 +#: code:addons/mrp/models/mrp_bom.py:222 #, python-format msgid "Warning" msgstr "" @@ -3014,7 +3070,7 @@ msgid "Work Sheet" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:498 +#: code:addons/mrp/models/mrp_production.py:512 #, python-format msgid "Work order %s is still running" msgstr "" @@ -3090,13 +3146,13 @@ msgid "You can configure by-products in the bill of material.\n" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:436 +#: code:addons/mrp/models/mrp_production.py:450 #, python-format msgid "You can not cancel production order, a work order is still in progress." msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:225 +#: code:addons/mrp/models/mrp_workorder.py:226 #, python-format msgid "You can not change the finished work order." msgstr "" @@ -3109,7 +3165,7 @@ msgid "You can not delete a Bill of Material with running manufacturing orders.\ msgstr "" #. module: mrp -#: code:addons/mrp/models/stock_move.py:121 +#: code:addons/mrp/models/stock_move.py:122 #, python-format msgid "You cannot cancel a move move having already consumed material" msgstr "" @@ -3121,19 +3177,19 @@ msgid "You have already produced %d qty , Please give update quantity more then msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:347 +#: code:addons/mrp/models/mrp_workorder.py:348 #, python-format msgid "You need to define at least one productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses." msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:343 +#: code:addons/mrp/models/mrp_workorder.py:344 #, python-format msgid "You need to define at least one productivity loss in the category 'Productivity'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses." msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:395 +#: code:addons/mrp/models/mrp_workorder.py:396 #, python-format msgid "You need to define at least one unactive productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses." msgstr "" @@ -3145,13 +3201,13 @@ msgid "You need to provide a lot for the finished product" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:281 +#: code:addons/mrp/models/mrp_workorder.py:282 #, python-format msgid "You should provide a lot for a component" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workorder.py:266 +#: code:addons/mrp/models/mrp_workorder.py:267 #, python-format msgid "You should provide a lot for the final product" msgstr "" diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot index cc8e8c85fd7..85695587170 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -110,6 +110,12 @@ msgstr "" msgid "Before Repair" msgstr "" +#. module: mrp_repair +#: code:addons/mrp_repair/models/mrp_repair.py:206 +#, python-format +msgid "Can only confirm draft repairs." +msgstr "" + #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.view_cancel_repair #: model:ir.ui.view,arch_db:mrp_repair.view_make_invoice @@ -134,6 +140,12 @@ msgstr "" msgid "Cancelled" msgstr "" +#. module: mrp_repair +#: code:addons/mrp_repair/models/mrp_repair.py:221 +#, python-format +msgid "Cannot cancel completed repairs." +msgstr "" + #. module: mrp_repair #: model:ir.model.fields,help:mrp_repair.field_mrp_repair_partner_id msgid "Choose partner for whom the order will be invoiced and delivered." @@ -163,8 +175,8 @@ msgid "Confirmed" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:500 -#: code:addons/mrp_repair/models/mrp_repair.py:562 +#: code:addons/mrp_repair/models/mrp_repair.py:512 +#: code:addons/mrp_repair/models/mrp_repair.py:574 #, python-format msgid "Couldn't find a pricelist line matching this product and quantity.\n" "You have to change either the product, the quantity or the pricelist." @@ -328,11 +340,6 @@ msgstr "" msgid "Invoice" msgstr "" -#. module: mrp_repair -#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form -msgid "Invoice Corrected" -msgstr "" - #. module: mrp_repair #: selection:mrp.repair,state:0 msgid "Invoice Exception" @@ -430,34 +437,34 @@ msgid "No Invoice" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:491 -#: code:addons/mrp_repair/models/mrp_repair.py:553 +#: code:addons/mrp_repair/models/mrp_repair.py:503 +#: code:addons/mrp_repair/models/mrp_repair.py:565 #, python-format msgid "No Pricelist!" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:250 +#: code:addons/mrp_repair/models/mrp_repair.py:260 #, python-format msgid "No account defined for partner \"%s\"." msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:275 -#: code:addons/mrp_repair/models/mrp_repair.py:303 +#: code:addons/mrp_repair/models/mrp_repair.py:285 +#: code:addons/mrp_repair/models/mrp_repair.py:313 #, python-format msgid "No account defined for product \"%s\"." msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:296 +#: code:addons/mrp_repair/models/mrp_repair.py:306 #, python-format msgid "No product defined on Fees!" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:498 -#: code:addons/mrp_repair/models/mrp_repair.py:560 +#: code:addons/mrp_repair/models/mrp_repair.py:510 +#: code:addons/mrp_repair/models/mrp_repair.py:572 #, python-format msgid "No valid pricelist line found !" msgstr "" @@ -570,11 +577,6 @@ msgstr "" msgid "Ready to Repair" msgstr "" -#. module: mrp_repair -#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form -msgid "Recreate Invoice" -msgstr "" - #. module: mrp_repair #: selection:mrp.repair.line,type:0 msgid "Remove" @@ -625,7 +627,37 @@ msgid "Repair Reference" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:217 +#: code:addons/mrp_repair/models/mrp_repair.py:194 +#, python-format +msgid "Repair must be canceled in order to reset it to draft." +msgstr "" + +#. module: mrp_repair +#: code:addons/mrp_repair/models/mrp_repair.py:343 +#, python-format +msgid "Repair must be confirmed before starting reparation." +msgstr "" + +#. module: mrp_repair +#: code:addons/mrp_repair/models/mrp_repair.py:373 +#, python-format +msgid "Repair must be invoiced in order to finalize it." +msgstr "" + +#. module: mrp_repair +#: code:addons/mrp_repair/models/mrp_repair.py:371 +#, python-format +msgid "Repair must be repaired in order to finalize it." +msgstr "" + +#. module: mrp_repair +#: code:addons/mrp_repair/models/mrp_repair.py:354 +#, python-format +msgid "Repair must be under repair in order to end reparation." +msgstr "" + +#. module: mrp_repair +#: code:addons/mrp_repair/models/mrp_repair.py:223 #, python-format msgid "Repair order is already invoiced." msgstr "" @@ -669,7 +701,7 @@ msgid "Selecting 'Before Repair' or 'After Repair' will allow you to generate in msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:210 +#: code:addons/mrp_repair/models/mrp_repair.py:213 #, python-format msgid "Serial number is required for operation line with product '%s'" msgstr "" @@ -818,14 +850,14 @@ msgid "Yes" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:238 +#: code:addons/mrp_repair/models/mrp_repair.py:248 #, python-format msgid "You have to select a Partner Invoice Address in the repair form!" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:493 -#: code:addons/mrp_repair/models/mrp_repair.py:555 +#: code:addons/mrp_repair/models/mrp_repair.py:505 +#: code:addons/mrp_repair/models/mrp_repair.py:567 #, python-format msgid "You have to select a pricelist in the Repair form !\n" " Please set one before choosing a product." diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot index 5cf438e8288..428d18202f3 100644 --- a/addons/pad/i18n/pad.pot +++ b/addons/pad/i18n/pad.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,11 +26,13 @@ msgid "Display Name" msgstr "" #. module: pad +#: model:ir.model.fields,help:pad.field_base_config_settings_pad_key #: model:ir.model.fields,help:pad.field_res_company_pad_key msgid "Etherpad lite api key." msgstr "" #. module: pad +#: model:ir.model.fields,help:pad.field_base_config_settings_pad_server #: model:ir.model.fields,help:pad.field_res_company_pad_server msgid "Etherpad lite server. Example: beta.primarypad.com" msgstr "" @@ -50,6 +52,16 @@ msgstr "" msgid "Pad Api Key" msgstr "" +#. module: pad +#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_key +msgid "Pad Api Key *" +msgstr "" + +#. module: pad +#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_server +msgid "Pad Server *" +msgstr "" + #. module: pad #: code:addons/pad/models/pad.py:57 #, python-format @@ -62,10 +74,17 @@ msgid "Pad server" msgstr "" #. module: pad -#: model:ir.ui.view,arch_db:pad.view_company_form_inherit_pad +#: model:ir.ui.view,arch_db:pad.view_general_configuration_form_inherit_pad msgid "Pads" msgstr "" +#. module: pad +#. openerp-web +#: code:addons/pad/static/src/xml/pad.xml:6 +#, python-format +msgid "Please enter your Etherpad credentials through the menu 'Settings > General Settings > Configure your company data', in the 'Configuration' tab of your company." +msgstr "" + #. module: pad #. openerp-web #: code:addons/pad/static/src/js/pad.js:53 @@ -81,14 +100,12 @@ msgid "Unable to load pad" msgstr "" #. module: pad -#. openerp-web -#: code:addons/pad/static/src/xml/pad.xml:6 -#, python-format -msgid "You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company." +#: model:ir.model,name:pad.model_base_config_settings +msgid "base.config.settings" msgstr "" #. module: pad -#: model:ir.ui.view,arch_db:pad.view_company_form_inherit_pad +#: model:ir.ui.view,arch_db:pad.view_general_configuration_form_inherit_pad msgid "e.g. beta.primarypad.com" msgstr "" diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot index dabcb76863d..32467d7f9d9 100644 --- a/addons/payment/i18n/payment.pot +++ b/addons/payment/i18n/payment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -103,11 +103,6 @@ msgstr "" msgid "Account journal used for automatic payment reconciliation." msgstr "" -#. module: payment -#: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id -msgid "Accounting Journal" -msgstr "" - #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction_acquirer_id msgid "Acquirer" @@ -150,18 +145,43 @@ msgstr "" msgid "Adyen" msgstr "" +#. module: payment +#: selection:payment.acquirer,save_token:0 +msgid "Always" +msgstr "" + #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction_amount #: model:ir.model.fields,help:payment.field_payment_transaction_amount msgid "Amount" msgstr "" +#. module: payment +#: selection:payment.acquirer,auto_confirm:0 +msgid "Authorize & capture the amount and confirm the SO on acquirer confirmation" +msgstr "" + +#. module: payment +#: selection:payment.acquirer,auto_confirm:0 +msgid "Authorize & capture the amount, confirm the SO and auto-validate the invoice on acquirer confirmation" +msgstr "" + +#. module: payment +#: selection:payment.acquirer,auto_confirm:0 +msgid "Authorize the amount and confirm the SO on acquirer confirmation (capture manually)" +msgstr "" + #. module: payment #: model:payment.acquirer,name:payment.payment_acquirer_authorize #: selection:payment.acquirer,provider:0 msgid "Authorize.Net" msgstr "" +#. module: payment +#: selection:payment.transaction,state:0 +msgid "Authorized" +msgstr "" + #. module: payment #: model:payment.acquirer,name:payment.payment_acquirer_buckaroo #: selection:payment.acquirer,provider:0 @@ -178,6 +198,11 @@ msgstr "" msgid "Canceled" msgstr "" +#. module: payment +#: model:ir.ui.view,arch_db:payment.transaction_form +msgid "Capture Transaction" +msgstr "" + #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_city #: model:ir.ui.view,arch_db:payment.transaction_form @@ -214,11 +239,6 @@ msgstr "" msgid "Configure payment acquiring methods" msgstr "" -#. module: payment -#: selection:payment.acquirer,auto_confirm:0 -msgid "Confirm the SO on acquirer confirmation" -msgstr "" - #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_module_id msgid "Corresponding Module" @@ -283,6 +303,11 @@ msgstr "" msgid "Description" msgstr "" +#. module: payment +#: model:ir.model.fields,help:payment.field_payment_acquirer_save_token +msgid "Determine if card data is saved as a token automatically or not. Payment tokens allow your customer to reuse their cards in the e-commerce or allow you to charge an invoice directly on a credit card. If set to 'let the customer decide', ecommerce customers will have a checkbox displayed on the payment page." +msgstr "" + #. module: payment #: model:ir.model.fields,help:payment.field_payment_acquirer_sequence msgid "Determine the display order" @@ -378,7 +403,7 @@ msgstr "" #. module: payment #: selection:payment.transaction,type:0 -msgid "Form with credentials storage" +msgid "Form with tokenization" msgstr "" #. module: payment @@ -450,6 +475,11 @@ msgstr "" msgid "Last Updated on" msgstr "" +#. module: payment +#: selection:payment.acquirer,save_token:0 +msgid "Let the customer decide" +msgstr "" + #. module: payment #: model:ir.model.fields,help:payment.field_payment_acquirer_website_published msgid "Make this payment acquirer available (Customer invoices, etc.)" @@ -524,19 +554,24 @@ msgstr "" msgid "Name of the payment token" msgstr "" +#. module: payment +#: selection:payment.acquirer,save_token:0 +msgid "Never" +msgstr "" + #. module: payment #: selection:payment.acquirer,auto_confirm:0 msgid "No automatic confirmation" msgstr "" #. module: payment -#: selection:payment.acquirer,provider:0 -msgid "Ogone" +#: model:ir.model.fields,help:payment.field_account_payment_payment_token_id +msgid "Note that tokens from acquirers set to only authorize transactions (instead of capturing the amount) are not available." msgstr "" #. module: payment -#: selection:payment.acquirer,auto_confirm:0 -msgid "On acquirer confirmation, confirm the SO, generate the invoice and pay it" +#: selection:payment.acquirer,provider:0 +msgid "Ogone" msgstr "" #. module: payment @@ -575,6 +610,11 @@ msgstr "" msgid "Payment Acquirers" msgstr "" +#. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id +msgid "Payment Journal" +msgstr "" + #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction_payment_token_id msgid "Payment Token" @@ -606,7 +646,7 @@ msgid "Payment Transactions" msgstr "" #. module: payment -#: code:addons/payment/models/account_payment.py:56 +#: code:addons/payment/models/account_payment.py:60 #, python-format msgid "Payment transaction failed (%s)" msgstr "" @@ -687,6 +727,11 @@ msgstr "" msgid "Saved payment token" msgstr "" +#. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_acquirer_token_implemented +msgid "Saving Card Data supported" +msgstr "" + #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_sequence msgid "Sequence" @@ -697,6 +742,11 @@ msgstr "" msgid "Server To Server" msgstr "" +#. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_token_short_name +msgid "Short name" +msgstr "" + #. module: payment #: model:payment.acquirer,name:payment.payment_acquirer_sips #: selection:payment.acquirer,provider:0 @@ -718,6 +768,11 @@ msgstr "" msgid "Status" msgstr "" +#. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_acquirer_save_token +msgid "Store Card Data" +msgstr "" + #. module: payment #: model:payment.acquirer,name:payment.payment_acquirer_stripe #: selection:payment.acquirer,provider:0 @@ -740,7 +795,7 @@ msgid "Thanks Message" msgstr "" #. module: payment -#: code:addons/payment/models/payment_acquirer.py:441 +#: code:addons/payment/models/payment_acquirer.py:472 #, python-format msgid "The payment transaction reference must be unique!" msgstr "" @@ -786,6 +841,11 @@ msgstr "" msgid "Visible in Portal / Website" msgstr "" +#. module: payment +#: model:ir.ui.view,arch_db:payment.transaction_form +msgid "Void Transaction" +msgstr "" + #. module: payment #: model:payment.acquirer,name:payment.payment_acquirer_transfer #: selection:payment.acquirer,provider:0 diff --git a/addons/payment_authorize/i18n/payment_authorize.pot b/addons/payment_authorize/i18n/payment_authorize.pot index e020ec12457..645d80eab03 100644 --- a/addons/payment_authorize/i18n/payment_authorize.pot +++ b/addons/payment_authorize/i18n/payment_authorize.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.saas~10c\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 14:07+0000\n" -"PO-Revision-Date: 2016-08-18 14:07+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,26 +15,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: payment_authorize -#: model:payment.acquirer,cancel_msg:payment_authorize.payment_acquirer_authorize -msgid "Cancel, Your payment has been cancelled." -msgstr "" - -#. module: payment_authorize -#: model:payment.acquirer,done_msg:payment_authorize.payment_acquirer_authorize -msgid "Done, Your online payment has been successfully processed. Thank you for your order." -msgstr "" - -#. module: payment_authorize -#: model:payment.acquirer,error_msg:payment_authorize.payment_acquirer_authorize -msgid "Error, Please be aware that an error occurred during the transaction. The order has been confirmed but won't be paid. Don't hesitate to contact us if you have any questions on the status of your order." -msgstr "" - -#. module: payment_authorize -#: model:payment.acquirer,pending_msg:payment_authorize.payment_acquirer_authorize -msgid "Pending, Your online payment has been successfully processed. But your order is not validated yet." -msgstr "" - #. module: payment_authorize #: model:ir.model.fields,field_description:payment_authorize.field_payment_acquirer_authorize_login msgid "API Login Id" @@ -46,8 +26,28 @@ msgid "API Transaction Key" msgstr "" #. module: payment_authorize -#: model:payment.acquirer,name:payment_authorize.payment_acquirer_authorize -msgid "Authorize.Net" +#: model:ir.model.fields,field_description:payment_authorize.field_payment_token_authorize_profile +msgid "Authorize.net Profile ID" +msgstr "" + +#. module: payment_authorize +#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form +msgid "CVC" +msgstr "" + +#. module: payment_authorize +#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form +msgid "Card number" +msgstr "" + +#. module: payment_authorize +#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form +msgid "Confirm " +msgstr "" + +#. module: payment_authorize +#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form +msgid "Expires" msgstr "" #. module: payment_authorize @@ -55,6 +55,16 @@ msgstr "" msgid "How to configure your Authorize.Net account (look for Getting Started Guide) ?" msgstr "" +#. module: payment_authorize +#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form +msgid "MM / YY" +msgstr "" + +#. module: payment_authorize +#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form +msgid "Name" +msgstr "" + #. module: payment_authorize #: model:ir.model,name:payment_authorize.model_payment_acquirer msgid "Payment Acquirer" @@ -66,7 +76,12 @@ msgid "Payment Transaction" msgstr "" #. module: payment_authorize -#: model:payment.acquirer,pre_msg:payment_authorize.payment_acquirer_authorize -msgid "You will be redirected to the Authorize website after clicking on the payment button." +#: model:ir.model.fields,help:payment_authorize.field_payment_token_authorize_profile +msgid "This contains the unique reference for this partner/payment token combination in the Authorize.net backend" +msgstr "" + +#. module: payment_authorize +#: model:ir.model,name:payment_authorize.model_payment_token +msgid "payment.token" msgstr "" diff --git a/addons/payment_ogone/i18n/payment_ogone.pot b/addons/payment_ogone/i18n/payment_ogone.pot index eae91cfca47..576022cbc60 100644 --- a/addons/payment_ogone/i18n/payment_ogone.pot +++ b/addons/payment_ogone/i18n/payment_ogone.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,13 +16,13 @@ msgstr "" "Plural-Forms: \n" #. module: payment_ogone -#: code:addons/payment_ogone/models/payment.py:226 +#: code:addons/payment_ogone/models/payment.py:241 #, python-format msgid "; multiple order found" msgstr "" #. module: payment_ogone -#: code:addons/payment_ogone/models/payment.py:224 +#: code:addons/payment_ogone/models/payment.py:239 #, python-format msgid "; no order found" msgstr "" @@ -69,10 +69,7 @@ msgstr "" #. module: payment_ogone #: model:ir.model.fields,help:payment_ogone.field_payment_acquirer_ogone_alias_usage -msgid "If you want to use Ogone Aliases,\n" -" this default Alias Usage will be presented to\n" -" the customer as the reason you want to\n" -" keep his payment data" +msgid "If you want to use Ogone Aliases, this default Alias Usage will be presented to the customer as the reason you want to keep his payment data" msgstr "" #. module: payment_ogone @@ -86,19 +83,19 @@ msgid "Name" msgstr "" #. module: payment_ogone -#: code:addons/payment_ogone/models/payment.py:233 +#: code:addons/payment_ogone/models/payment.py:248 #, python-format msgid "Ogone: invalid shasign, received %s, computed %s, for data %s" msgstr "" #. module: payment_ogone -#: code:addons/payment_ogone/models/payment.py:222 +#: code:addons/payment_ogone/models/payment.py:237 #, python-format msgid "Ogone: received data for reference %s" msgstr "" #. module: payment_ogone -#: code:addons/payment_ogone/models/payment.py:215 +#: code:addons/payment_ogone/models/payment.py:230 #, python-format msgid "Ogone: received data with missing reference (%s) or pay_id (%s) or shasign (%s)" msgstr "" diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index cb0f284a1ec..e70904f9eaa 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:677 +#: code:addons/point_of_sale/models/pos_order.py:678 #, python-format msgid " REFUND" msgstr "" @@ -383,12 +383,6 @@ msgstr "" msgid "Average Price" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.bacardi -#: model:product.template,name:point_of_sale.bacardi_product_template -msgid "Bacardi" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:267 @@ -397,12 +391,6 @@ msgstr "" msgid "Back" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.baileys -#: model:product.template,name:point_of_sale.baileys_product_template -msgid "Baileys" -msgstr "" - #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_account_bank_statement #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_statement_ids @@ -440,29 +428,11 @@ msgstr "" msgid "Barcodes" msgstr "" -#. module: point_of_sale -#: model:pos.category,name:point_of_sale.beer -msgid "Beers" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos -#: model:pos.category,name:point_of_sale.beverage msgid "Beverages" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.bloody_mary -#: model:product.template,name:point_of_sale.bloody_mary_product_template -msgid "Bloody Mary" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.budweiser -#: model:product.template,name:point_of_sale.budweiser_product_template -msgid "Budweiser" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/screens.js:895 @@ -482,12 +452,6 @@ msgstr "" msgid "CHANGE" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.caipirinha -#: model:product.template,name:point_of_sale.caipirinha_product_template -msgid "Caipirinha" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:430 @@ -518,24 +482,6 @@ msgstr "" msgid "Cannot return change without a cash payment method" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.captain_morgan -#: model:product.template,name:point_of_sale.captain_morgan_product_template -msgid "Captain Morgan" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.capuccino -#: model:product.template,name:point_of_sale.capuccino_product_template -msgid "Capuccino" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.carlsberg -#: model:product.template,name:point_of_sale.carlsberg_product_template -msgid "Carlsberg" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_cash_control #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form @@ -733,23 +679,6 @@ msgstr "" msgid "Closing Date" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.coke -#: model:product.template,name:point_of_sale.coke_product_template -msgid "Coca-Cola" -msgstr "" - -#. module: point_of_sale -#: model:pos.category,name:point_of_sale.cocktail -msgid "Cocktails" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.coffee -#: model:product.template,name:point_of_sale.coffee_product_template -msgid "Coffee" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_company_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_company_id @@ -793,18 +722,6 @@ msgstr "" msgid "Continue Selling" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.corona -#: model:product.template,name:point_of_sale.corona_product_template -msgid "Corona" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.cosmopolitan -#: model:product.template,name:point_of_sale.cosmopolitan_product_template -msgid "Cosmopolitan" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/screens.js:1285 @@ -856,12 +773,6 @@ msgstr "" msgid "Credit Cards" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.cuba_libre -#: model:product.template,name:point_of_sale.cuba_libre_product_template -msgid "Cuba Libre" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_currency_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_currency_id @@ -890,18 +801,12 @@ msgid "Customer" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:421 -#: code:addons/point_of_sale/models/pos_order.py:466 +#: code:addons/point_of_sale/models/pos_order.py:417 +#: code:addons/point_of_sale/models/pos_order.py:471 #, python-format msgid "Customer Invoice" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.daiquiri -#: model:product.template,name:point_of_sale.daiquiri_product_template -msgid "Daiquiri" -msgstr "" - #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard msgid "Dashboard" @@ -996,12 +901,6 @@ msgstr "" msgid "Difference between the theoretical closing balance and the real closing balance." msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.disaronno -#: model:product.template,name:point_of_sale.disaronno_product_template -msgid "Disaronno" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:139 @@ -1092,12 +991,6 @@ msgstr "" msgid "Due" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.efes -#: model:product.template,name:point_of_sale.efes_product_template -msgid "Efes" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1199 @@ -1183,12 +1076,6 @@ msgstr "" msgid "Error: The Point of Sale User must belong to the same company as the Point of Sale. You are probably trying to load the point of sale as an administrator in a multi-company setup, with the administrator account set to the wrong company." msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.espresso -#: model:product.template,name:point_of_sale.espresso_product_template -msgid "Espresso" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1218 @@ -1208,12 +1095,6 @@ msgstr "" msgid "Extra Info" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.fanta -#: model:product.template,name:point_of_sale.fanta_product_template -msgid "Fanta" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form msgid "Features" @@ -1246,12 +1127,6 @@ msgstr "" msgid "For imprecise industrial touchscreens" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.fosters -#: model:product.template,name:point_of_sale.fosters_product_template -msgid "Foster's" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form msgid "General Information" @@ -1267,18 +1142,6 @@ msgstr "" msgid "Gives the sequence order when displaying a list of product categories." msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.gordon -#: model:product.template,name:point_of_sale.gordon_product_template -msgid "Gordon" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.green_tea -#: model:product.template,name:point_of_sale.green_tea_product_template -msgid "Green Tea" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search @@ -1291,12 +1154,6 @@ msgstr "" msgid "Group Journal Items" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.guinness -#: model:product.template,name:point_of_sale.guinness_product_template -msgid "Guinness" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1230 @@ -1326,11 +1183,6 @@ msgstr "" msgid "Header" msgstr "" -#. module: point_of_sale -#: model:pos.category,name:point_of_sale.hot -msgid "Hot Drinks" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_id @@ -1359,12 +1211,6 @@ msgstr "" msgid "IP Address" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.ice_tea -#: model:product.template,name:point_of_sale.ice_tea_product_template -msgid "Ice Tea" -msgstr "" - #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.product_pos_category_action msgid "If you put a photo on the category, the layout of the\n" @@ -1387,11 +1233,6 @@ msgstr "" msgid "Implemented by" msgstr "" -#. module: point_of_sale -#: model:pos.category,name:point_of_sale.alcohol -msgid "Import Drinks" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1220 @@ -1466,29 +1307,11 @@ msgstr "" msgid "Invoicing" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.irish_coffee -#: model:product.template,name:point_of_sale.irish_coffee_product_template -msgid "Irish Coffee" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_account_bank_statement_account_id msgid "It acts as a default account for debit amount" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.jack_daniels -#: model:product.template,name:point_of_sale.jack_daniels_product_template -msgid "Jack Daniel's" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.jim_beam -#: model:product.template,name:point_of_sale.jim_beam_product_template -msgid "Jim Beam" -msgstr "" - #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_account_journal #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_journal_id @@ -1648,12 +1471,6 @@ msgstr "" msgid "Make Payment" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.malibu -#: model:product.template,name:point_of_sale.malibu_product_template -msgid "Malibu" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos msgid "Manage loyalty program with points and rewards for customers" @@ -1664,26 +1481,6 @@ msgstr "" msgid "Manager" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.manhattan -#: model:product.template,name:point_of_sale.manhattan_product_template -msgid "Manhattan" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.margarita -#: model:product.template,name:point_of_sale.margarita_product_template -msgid "Margarita" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.martini -#: model:product.product,name:point_of_sale.martini_cocktail -#: model:product.template,name:point_of_sale.martini_cocktail_product_template -#: model:product.template,name:point_of_sale.martini_product_template -msgid "Martini" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_image_medium msgid "Medium-sized image" @@ -1701,65 +1498,12 @@ msgstr "" msgid "Method" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.milkshake_banana -#: model:product.template,name:point_of_sale.milkshake_banana_product_template -msgid "Milkshake Banana" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.milkshake_cherry -#: model:product.template,name:point_of_sale.milkshake_cherry_product_template -msgid "Milkshake Cherry" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.milkshake_chocolate -#: model:product.template,name:point_of_sale.milkshake_chocolate_product_template -msgid "Milkshake Chocolate" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.milkshake_strawberry -#: model:product.template,name:point_of_sale.milkshake_strawberry_product_template -msgid "Milkshake Strawberry" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.milkshake_vanilla -#: model:product.template,name:point_of_sale.milkshake_vanilla_product_template -msgid "Milkshake Vanilla" -msgstr "" - -#. module: point_of_sale -#: model:pos.category,name:point_of_sale.milkshake -msgid "Milkshakes" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.miller -#: model:product.template,name:point_of_sale.miller_product_template -msgid "Miller" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.minute_maid -#: model:product.template,name:point_of_sale.minute_maid_product_template -msgid "Minute Maid" -msgstr "" - #. module: point_of_sale #: model:product.product,name:point_of_sale.product_product_consumable #: model:product.template,name:point_of_sale.product_product_consumable_product_template msgid "Miscellaneous" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.mojito -#: model:product.template,name:point_of_sale.mojito_product_template -msgid "Mojito" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search msgid "Month of order date" @@ -1808,12 +1552,6 @@ msgstr "" msgid "Negative Bank Payment" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.nescafe -#: model:product.template,name:point_of_sale.nescafe_product_template -msgid "Nescafe" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter #: selection:pos.order,state:0 @@ -2043,6 +1781,12 @@ msgstr "" msgid "Order Sequence Number" msgstr "" +#. module: point_of_sale +#: code:addons/point_of_sale/models/pos_order.py:429 +#, python-format +msgid "Order is not paid." +msgstr "" + #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form msgid "Order lines" @@ -2250,12 +1994,6 @@ msgstr "" msgid "Picking count" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.pina_colada -#: model:product.template,name:point_of_sale.pina_colada_product_template -msgid "Pina Colada" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/screens.js:1900 @@ -2270,7 +2008,7 @@ msgid "Please define income account for this product: \"%s\" (id:%d)." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:442 +#: code:addons/point_of_sale/models/pos_order.py:445 #, python-format msgid "Please provide a partner for the sale." msgstr "" @@ -2575,24 +2313,6 @@ msgstr "" msgid "Receipt Ref" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.red_label -#: model:product.template,name:point_of_sale.red_label_product_template -msgid "Red Label" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.red_wine -#: model:product.template,name:point_of_sale.red_wine_product_template -msgid "Red Wine" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.redbull -#: model:product.template,name:point_of_sale.redbull_product_template -msgid "RedBull" -msgstr "" - #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_rep msgid "Reports" @@ -2631,7 +2351,7 @@ msgid "Resume" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:688 +#: code:addons/point_of_sale/models/pos_order.py:689 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form #, python-format msgid "Return Products" @@ -2642,18 +2362,6 @@ msgstr "" msgid "Returned" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.rose_wine -#: model:product.template,name:point_of_sale.rose_wine_product_template -msgid "Rose Wine" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.safari -#: model:product.template,name:point_of_sale.safari_product_template -msgid "Safari" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_journal_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_sale_journal @@ -2717,12 +2425,6 @@ msgstr "" msgid "Scanner" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.schweppes -#: model:product.template,name:point_of_sale.schweppes_product_template -msgid "Schweppes" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:434 @@ -2812,7 +2514,7 @@ msgid "Server Error" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:253 +#: code:addons/point_of_sale/models/pos_config.py:254 #: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_pos_session_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_session_id #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_session_id @@ -2890,17 +2592,6 @@ msgstr "" msgid "Small-sized image of the category. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required." msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.smirnoff -#: model:product.template,name:point_of_sale.smirnoff_product_template -msgid "Smirnoff" -msgstr "" - -#. module: point_of_sale -#: model:pos.category,name:point_of_sale.soft -msgid "Soft Drinks" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/gui.js:322 @@ -2913,12 +2604,6 @@ msgstr "" msgid "Specify product lot/serial number in pos order line" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.sprite -#: model:product.template,name:point_of_sale.sprite_product_template -msgid "Sprite" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id msgid "Start Category" @@ -2953,12 +2638,6 @@ msgstr "" msgid "Status" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.stella_artois -#: model:product.template,name:point_of_sale.stella_artois_product_template -msgid "Stella Artois" -msgstr "" - #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_stock_location_id msgid "Stock Location" @@ -3082,12 +2761,6 @@ msgstr "" msgid "Tendered" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.tequila -#: model:product.template,name:point_of_sale.tequila_product_template -msgid "Tequila" -msgstr "" - #. module: point_of_sale #: code:addons/point_of_sale/models/pos_order.py:253 #, python-format @@ -3224,7 +2897,7 @@ msgid "The transactions are processed by MercuryPay" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:233 +#: code:addons/point_of_sale/models/pos_session.py:240 #, python-format msgid "The type of the journal for your payment method should be bank or cash " msgstr "" @@ -3257,13 +2930,13 @@ msgid "There is no cash register for this PoS Session" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:642 +#: code:addons/point_of_sale/models/pos_order.py:643 #, python-format msgid "There is no receivable account defined to make payment for the partner: \"%s\" (id:%d)." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:640 +#: code:addons/point_of_sale/models/pos_order.py:641 #, python-format msgid "There is no receivable account defined to make payment." msgstr "" @@ -3301,7 +2974,7 @@ msgid "This field is there to pass the id of the pos user group to the point of msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:450 +#: code:addons/point_of_sale/models/pos_order.py:453 #, python-format msgid "This invoice has been created from the point of sale session: %s" msgstr "" @@ -3337,7 +3010,7 @@ msgid "This sequence is automatically created by Odoo but you can change it to c msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:564 +#: code:addons/point_of_sale/models/pos_order.py:565 #, python-format msgid "This transfer has been created from the point of sale session: %s" msgstr "" @@ -3365,7 +3038,7 @@ msgid "To Weigh With Scale" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:673 +#: code:addons/point_of_sale/models/pos_order.py:674 #, python-format msgid "To return product(s), you need to open a session that will be used to register the refund." msgstr "" @@ -3436,12 +3109,6 @@ msgstr "" msgid "Trade Receivables" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.tuborg -#: model:product.template,name:point_of_sale.tuborg_product_template -msgid "Tuborg" -msgstr "" - #. module: point_of_sale #: code:addons/point_of_sale/models/pos_session.py:149 #, python-format @@ -3538,12 +3205,6 @@ msgstr "" msgid "Warehouse" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.water -#: model:product.template,name:point_of_sale.water_product_template -msgid "Water" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1228 @@ -3557,23 +3218,6 @@ msgstr "" msgid "Weighted Product" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.white_russian -#: model:product.template,name:point_of_sale.white_russian_product_template -msgid "White Russian" -msgstr "" - -#. module: point_of_sale -#: model:product.product,name:point_of_sale.white_wine -#: model:product.template,name:point_of_sale.white_wine_product_template -msgid "White Wine" -msgstr "" - -#. module: point_of_sale -#: model:pos.category,name:point_of_sale.wine -msgid "Wine" -msgstr "" - #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1154 @@ -3587,12 +3231,6 @@ msgstr "" msgid "Year" msgstr "" -#. module: point_of_sale -#: model:product.product,name:point_of_sale.tea -#: model:product.template,name:point_of_sale.tea_product_template -msgid "Yellow Tea" -msgstr "" - #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form msgid "You can define another list of available currencies on the\n" @@ -3637,7 +3275,7 @@ msgid "You cannot have a negative amount in a Bank payment. Use a cash payment m msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:249 +#: code:addons/point_of_sale/models/pos_session.py:256 #, python-format msgid "You cannot use the session of another users. This session is owned by %s. Please first close this one to use this point of sale." msgstr "" @@ -3649,19 +3287,19 @@ msgid "You have to define which payment method must be available in the point of msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:656 +#: code:addons/point_of_sale/models/pos_order.py:657 #, python-format msgid "You have to open at least one cashbox." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:761 +#: code:addons/point_of_sale/models/pos_order.py:762 #, python-format msgid "You have to select a pricelist in the sale form !" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:749 +#: code:addons/point_of_sale/models/pos_order.py:750 #, python-format msgid "You have to select a pricelist in the sale form !\n" "Please set one before choosing a product." @@ -3701,7 +3339,7 @@ msgid "Your Internet connection is probably down." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:231 +#: code:addons/point_of_sale/models/pos_session.py:238 #, python-format msgid "Your ending balance is too different from the theoretical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it." msgstr "" diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index 039b7c4e9f5..1c79405bd65 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgid "%s %% discount and %s surcharge" msgstr "" #. module: product -#: code:addons/product/models/product_template.py:278 +#: code:addons/product/models/product_template.py:302 #, python-format msgid "%s (copy)" msgstr "" @@ -261,6 +261,13 @@ msgstr "" msgid "Calculate Product Price per Unit Based on Pricelist Version." msgstr "" +#. module: product +#: model:ir.model.fields,field_description:product.field_product_product_purchase_ok +#: model:ir.model.fields,field_description:product.field_product_template_purchase_ok +#: model:ir.ui.view,arch_db:product.product_template_search_view +msgid "Can be Purchased" +msgstr "" + #. module: product #: model:ir.model.fields,field_description:product.field_product_product_rental #: model:ir.model.fields,field_description:product.field_product_template_rental @@ -507,11 +514,6 @@ msgstr "" msgid "Description for Quotations" msgstr "" -#. module: product -#: model:ir.ui.view,arch_db:product.product_template_form_view -msgid "Description for Vendors" -msgstr "" - #. module: product #: model:ir.model.fields,help:product.field_product_attribute_sequence #: model:ir.model.fields,help:product.field_product_attribute_value_sequence @@ -597,7 +599,7 @@ msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceLi msgstr "" #. module: product -#: code:addons/product/models/product_template.py:243 +#: code:addons/product/models/product_template.py:252 #, python-format msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category." msgstr "" @@ -730,7 +732,6 @@ msgstr "" #. module: product #: model:ir.model.fields,field_description:product.field_product_product_categ_id #: model:ir.model.fields,field_description:product.field_product_template_categ_id -#: model:ir.ui.view,arch_db:product.product_template_form_view msgid "Internal Category" msgstr "" @@ -747,11 +748,6 @@ msgstr "" msgid "International Article Number used for product identification." msgstr "" -#. module: product -#: model:ir.ui.view,arch_db:product.product_template_form_view -msgid "Inventory" -msgstr "" - #. module: product #: model:ir.model.fields,field_description:product.field_product_attribute___last_update #: model:ir.model.fields,field_description:product.field_product_attribute_line___last_update @@ -952,7 +948,6 @@ msgstr "" #: model:ir.model,name:product.model_product_packaging #: model:ir.ui.view,arch_db:product.product_packaging_form_view #: model:ir.ui.view,arch_db:product.product_packaging_tree_view -#: model:ir.ui.view,arch_db:product.product_template_form_view msgid "Packaging" msgstr "" @@ -1121,6 +1116,8 @@ msgstr "" #: model:ir.model.fields,field_description:product.field_product_packaging_product_tmpl_id #: model:ir.model.fields,field_description:product.field_product_price_history_product_id #: model:ir.model.fields,field_description:product.field_product_pricelist_item_product_id +#: model:ir.model.fields,field_description:product.field_product_product_product_variant_id +#: model:ir.model.fields,field_description:product.field_product_template_product_variant_id #: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view #: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view #: model:ir.ui.view,arch_db:product.product_supplierinfo_tree_view @@ -1336,11 +1333,6 @@ msgstr "" msgid "Rounding Precision" msgstr "" -#. module: product -#: model:ir.ui.view,arch_db:product.product_template_form_view -msgid "Sale Conditions" -msgstr "" - #. module: product #: model:ir.model.fields,field_description:product.field_product_product_description_sale #: model:ir.model.fields,field_description:product.field_product_template_description_sale @@ -1604,11 +1596,6 @@ msgstr "" msgid "This is the sum of the extra price of all attributes" msgstr "" -#. module: product -#: model:ir.ui.view,arch_db:product.product_template_form_view -msgid "This note will be displayed on requests for quotation." -msgstr "" - #. module: product #: model:ir.ui.view,arch_db:product.product_template_form_view msgid "This note will be displayed on the quotations." @@ -1771,7 +1758,6 @@ msgstr "" #. module: product #: model:ir.model.fields,field_description:product.field_product_product_seller_ids #: model:ir.model.fields,field_description:product.field_product_template_seller_ids -#: model:ir.ui.view,arch_db:product.product_template_form_view msgid "Vendors" msgstr "" @@ -1783,7 +1769,6 @@ msgstr "" #. module: product #: model:ir.model.fields,field_description:product.field_product_product_volume #: model:ir.model.fields,field_description:product.field_product_template_volume -#: model:ir.ui.view,arch_db:product.product_template_form_view #: model:product.uom.categ,name:product.product_uom_categ_vol msgid "Volume" msgstr "" @@ -1938,11 +1923,6 @@ msgstr "" msgid "mile(s)" msgstr "" -#. module: product -#: model:ir.ui.view,arch_db:product.product_template_form_view -msgid "months" -msgstr "" - #. module: product #: model:product.uom,name:product.product_uom_oz msgid "oz(s)" diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index 640974bdd8c..aec2296c8a8 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,9 +18,8 @@ msgstr "" #. module: project #: model:mail.template,body_html:project.mail_template_data_module_install_project msgid "\n" -" % set last_created_project = user.env['project.project'].search([('alias_id','<>',False)], order=\"create_date desc\")[0]\n" -"\n" "

\n" +" % set last_created_project = user.env['project.project'].search([('alias_id','!=',False)], order=\"create_date desc\")[0]\n" "
\n" " \n" " \n" @@ -133,14 +132,13 @@ msgid "# of Days" msgstr "" #. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_nbr_tasks #: model:ir.model.fields,field_description:project.field_report_project_task_user_nbr msgid "# of Tasks" msgstr "" #. module: project -#: code:addons/project/models/project.py:235 -#: code:addons/project/models/project.py:404 +#: code:addons/project/models/project.py:240 +#: code:addons/project/models/project.py:416 #, python-format msgid "%s (copy)" msgstr "" @@ -216,7 +214,7 @@ msgid "

\n" msgstr "" #. module: project -#: code:addons/project/models/project.py:145 +#: code:addons/project/models/project.py:150 #, python-format msgid "

Click to create a new project.

" msgstr "" @@ -351,6 +349,11 @@ msgid "\n" " " msgstr "" +#. module: project +#: model:ir.ui.view,arch_db:project.view_config_settings +msgid "(*) This configuration value is related to the company you're logged in." +msgstr "" + #. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Contact us to customize your application:
\n" @@ -749,6 +752,11 @@ msgstr "" msgid "Add columns to configure stages for your tasks.
e.g. Specification > Development > Done" msgstr "" +#. module: project +#: model:ir.ui.view,arch_db:project.view_project_kanban +msgid "Add/remove from favorite" +msgstr "" + #. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:55 @@ -855,7 +863,6 @@ msgstr "" #. module: project #: model:ir.model.fields,field_description:project.field_project_task_user_id -#: model:ir.ui.view,arch_db:project.view_task_history_search #: model:ir.ui.view,arch_db:project.view_task_project_user_search #: model:ir.ui.view,arch_db:project.view_task_search_form msgid "Assigned to" @@ -933,10 +940,7 @@ msgid "Be aware of the team’s productivity and time: try to keep meetings to o msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_task_history_search #: selection:project.task,kanban_state:0 -#: selection:project.task.history,kanban_state:0 -#: selection:project.task.history.cumulative,kanban_state:0 #: selection:report.project.task.user,state:0 msgid "Blocked" msgstr "" @@ -986,7 +990,7 @@ msgid "Choose a project name. (e.g. Website Launch, Product Development, msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.edit_project_simplified +#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified msgid "Choose a Project Email" msgstr "" @@ -1035,11 +1039,6 @@ msgstr "" msgid "Click to add a stage in the task pipeline." msgstr "" -#. module: project -#: model:ir.ui.view,arch_db:project.view_project_kanban -msgid "Click to add/remove from favorite" -msgstr "" - #. module: project #: model:ir.actions.act_window,help:project.open_view_project_all msgid "Click to create a new project.
" @@ -1068,6 +1067,7 @@ msgid "Companies" msgstr "" #. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_company_id #: model:ir.model.fields,field_description:project.field_project_project_company_id #: model:ir.model.fields,field_description:project.field_project_task_company_id #: model:ir.model.fields,field_description:project.field_report_project_task_user_company_id @@ -1140,7 +1140,7 @@ msgid "Copywriting / Design" msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.edit_project_simplified +#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified msgid "Create" msgstr "" @@ -1208,7 +1208,6 @@ msgid "Creating Tasks and/or Issues is the next step in managing your Projects.< msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_task_history_search #: model:ir.ui.view,arch_db:project.view_task_project_user_search msgid "Creation Date" msgstr "" @@ -1219,10 +1218,7 @@ msgid "Credit" msgstr "" #. module: project -#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative -#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative_filter -#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative -#: model:ir.ui.view,arch_db:project.view_project_kanban +#: model:ir.filters,name:project.filter_task_report_cumulative_flow msgid "Cumulative Flow" msgstr "" @@ -1237,7 +1233,7 @@ msgid "Current Timesheet" msgstr "" #. module: project -#: code:addons/project/models/project.py:663 +#: code:addons/project/models/project.py:659 #: model:ir.model.fields,field_description:project.field_project_project_partner_id #: model:ir.model.fields,field_description:project.field_project_task_partner_id #: model:ir.ui.view,arch_db:project.edit_project @@ -1246,7 +1242,7 @@ msgid "Customer" msgstr "" #. module: project -#: code:addons/project/models/project.py:663 +#: code:addons/project/models/project.py:659 #, python-format msgid "Customer Email" msgstr "" @@ -1299,12 +1295,6 @@ msgstr "" msgid "Dashboard" msgstr "" -#. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_date -#: model:ir.model.fields,field_description:project.field_project_task_history_date -msgid "Date" -msgstr "" - #. module: project #: model:ir.model.fields,field_description:project.field_report_project_task_user_opening_days msgid "Days to Assign" @@ -1383,7 +1373,7 @@ msgstr "" #. module: project #. openerp-web #: code:addons/project/static/src/js/project.js:50 -#: model:ir.ui.view,arch_db:project.edit_project_simplified +#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified #, python-format msgid "Discard" msgstr "" @@ -1393,8 +1383,6 @@ msgstr "" #: model:ir.model.fields,field_description:project.field_project_project_display_name #: model:ir.model.fields,field_description:project.field_project_tags_display_name #: model:ir.model.fields,field_description:project.field_project_task_display_name -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_display_name -#: model:ir.model.fields,field_description:project.field_project_task_history_display_name #: model:ir.model.fields,field_description:project.field_project_task_type_display_name #: model:ir.model.fields,field_description:project.field_report_project_task_user_display_name msgid "Display Name" @@ -1501,12 +1489,6 @@ msgstr "" msgid "End" msgstr "" -#. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_end_date -#: model:ir.model.fields,field_description:project.field_project_task_history_end_date -msgid "End Date" -msgstr "" - #. module: project #: model:ir.model.fields,field_description:project.field_project_task_date_end #: model:ir.model.fields,field_description:project.field_report_project_task_user_date_end @@ -1514,7 +1496,7 @@ msgid "Ending Date" msgstr "" #. module: project -#: code:addons/project/models/project.py:412 +#: code:addons/project/models/project.py:424 #, python-format msgid "Error ! Task starting date must be lower than its ending date." msgstr "" @@ -1578,11 +1560,6 @@ msgstr "" msgid "Extra useful for when you're with a customer or in a meeting." msgstr "" -#. module: project -#: model:ir.ui.view,arch_db:project.view_project_kanban -msgid "Favorite" -msgstr "" - #. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:88 @@ -1700,7 +1677,6 @@ msgstr "" #. module: project #: model:ir.ui.view,arch_db:project.view_project_project_filter -#: model:ir.ui.view,arch_db:project.view_task_history_search #: model:ir.ui.view,arch_db:project.view_task_project_user_search #: model:ir.ui.view,arch_db:project.view_task_search_form msgid "Group By" @@ -1722,11 +1698,6 @@ msgstr "" msgid "High" msgstr "" -#. module: project -#: model:ir.model,name:project.model_project_task_history -msgid "History of Tasks" -msgstr "" - #. module: project #: model:ir.model.fields,help:project.field_project_project_privacy_visibility msgid "Holds visibility of the tasks or issues that belong to the current project:\n" @@ -1739,7 +1710,7 @@ msgid "Holds visibility of the tasks or issues that belong to the current projec msgstr "" #. module: project -#: code:addons/project/models/project.py:591 +#: code:addons/project/models/project.py:587 #, python-format msgid "I take it" msgstr "" @@ -1748,8 +1719,6 @@ msgstr "" #: model:ir.model.fields,field_description:project.field_project_config_settings_id #: model:ir.model.fields,field_description:project.field_project_project_id #: model:ir.model.fields,field_description:project.field_project_tags_id -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_id -#: model:ir.model.fields,field_description:project.field_project_task_history_id #: model:ir.model.fields,field_description:project.field_project_task_id #: model:ir.model.fields,field_description:project.field_project_task_type_id #: model:ir.model.fields,field_description:project.field_report_project_task_user_id @@ -1958,9 +1927,8 @@ msgid "Kanban Stages" msgstr "" #. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_kanban_state -#: model:ir.model.fields,field_description:project.field_project_task_history_kanban_state #: model:ir.model.fields,field_description:project.field_project_task_kanban_state +#: model:ir.model.fields,field_description:project.field_report_project_task_user_state msgid "Kanban State" msgstr "" @@ -1990,8 +1958,6 @@ msgstr "" #: model:ir.model.fields,field_description:project.field_project_project___last_update #: model:ir.model.fields,field_description:project.field_project_tags___last_update #: model:ir.model.fields,field_description:project.field_project_task___last_update -#: model:ir.model.fields,field_description:project.field_project_task_history___last_update -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative___last_update #: model:ir.model.fields,field_description:project.field_project_task_type___last_update #: model:ir.model.fields,field_description:project.field_report_project_task_user___last_update msgid "Last Modified on" @@ -2084,11 +2050,6 @@ msgstr "" msgid "Members" msgstr "" -#. module: project -#: model:ir.ui.view,arch_db:project.view_task_history_search -msgid "Month" -msgstr "" - #. module: project #: model:ir.ui.view,arch_db:project.view_project_kanban msgid "More " @@ -2106,12 +2067,10 @@ msgstr "" #. module: project #: model:ir.ui.view,arch_db:project.view_project_project_filter -#: model:ir.ui.view,arch_db:project.view_task_history_search -msgid "My Projects" +msgid "My Favorites" msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_task_history_search #: model:ir.ui.view,arch_db:project.view_task_search_form msgid "My Tasks" msgstr "" @@ -2124,7 +2083,6 @@ msgstr "" #. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:64 -#: model:ir.ui.view,arch_db:project.view_task_history_search #: model:ir.ui.view,arch_db:project.view_task_project_user_search #: model:ir.ui.view,arch_db:project.view_task_search_form #: model:project.task.type,name:project.project_stage_data_0 @@ -2133,7 +2091,7 @@ msgid "New" msgstr "" #. module: project -#: code:addons/project/models/project.py:593 +#: code:addons/project/models/project.py:589 #, python-format msgid "New Task" msgstr "" @@ -2152,8 +2110,6 @@ msgstr "" #. module: project #: selection:project.task,priority:0 -#: selection:project.task.history,kanban_state:0 -#: selection:project.task.history.cumulative,kanban_state:0 #: selection:report.project.task.user,priority:0 msgid "Normal" msgstr "" @@ -2208,7 +2164,7 @@ msgid "Odoo's project management allows you to manage the pipeline of your tasks msgstr "" #. module: project -#: code:addons/project/models/project.py:198 +#: code:addons/project/models/project.py:203 #: selection:project.project,privacy_visibility:0 #, python-format msgid "On invitation only" @@ -2312,19 +2268,13 @@ msgstr "" msgid "Plan your activities for the day" msgstr "" -#. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_planned_hours -#: model:ir.model.fields,field_description:project.field_project_task_history_planned_hours -msgid "Planned Time" -msgstr "" - #. module: project #: model:ir.model,name:project.model_web_planner msgid "Planner" msgstr "" #. module: project -#: code:addons/project/models/project.py:743 +#: code:addons/project/models/project.py:739 #, python-format msgid "Please remove existing tasks in the project linked to the accounts you want to delete." msgstr "" @@ -2366,12 +2316,11 @@ msgstr "" #. module: project #: model:ir.model,name:project.model_project_project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_project_id #: model:ir.model.fields,field_description:project.field_project_task_project_id #: model:ir.model.fields,field_description:project.field_report_project_task_user_project_id +#: model:ir.ui.menu,name:project.menu_main_pm #: model:ir.ui.view,arch_db:project.edit_project -#: model:ir.ui.view,arch_db:project.edit_project_simplified -#: model:ir.ui.view,arch_db:project.view_task_history_search +#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified #: model:ir.ui.view,arch_db:project.view_task_project_user_search #: model:ir.ui.view,arch_db:project.view_task_search_form #: model:res.request.link,name:project.req_link_project @@ -2405,7 +2354,7 @@ msgstr "" #. module: project #: model:ir.ui.view,arch_db:project.edit_project -#: model:ir.ui.view,arch_db:project.edit_project_simplified +#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified #: model:ir.ui.view,arch_db:project.view_project #: model:ir.ui.view,arch_db:project.view_project_project_filter msgid "Project Name" @@ -2424,11 +2373,14 @@ msgstr "" #. module: project #: model:ir.ui.view,arch_db:project.view_project_task_graph #: model:ir.ui.view,arch_db:project.view_project_task_pivot -#: model:ir.ui.view,arch_db:project.view_task_history_graph -#: model:ir.ui.view,arch_db:project.view_task_history_pivot msgid "Project Tasks" msgstr "" +#. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_project_time_mode_id +msgid "Project Time Unit *" +msgstr "" + #. module: project #: model:res.request.link,name:project.req_link_task msgid "Project task" @@ -2447,7 +2399,6 @@ msgstr "" #: model:ir.model.fields,field_description:project.field_project_task_type_project_ids #: model:ir.ui.menu,name:project.menu_projects_config #: model:ir.ui.view,arch_db:project.analytic_account_inherited_form -#: model:ir.ui.view,arch_db:project.task_company #: model:ir.ui.view,arch_db:project.view_project msgid "Projects" msgstr "" @@ -2462,11 +2413,6 @@ msgstr "" msgid "Rating on task" msgstr "" -#. module: project -#: model:ir.ui.view,arch_db:project.view_task_history_search -msgid "Ready" -msgstr "" - #. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:40 @@ -2476,8 +2422,6 @@ msgstr "" #. module: project #: selection:project.task,kanban_state:0 -#: selection:project.task.history,kanban_state:0 -#: selection:project.task.history.cumulative,kanban_state:0 #: selection:report.project.task.user,state:0 msgid "Ready for next stage" msgstr "" @@ -2538,12 +2482,6 @@ msgstr "" msgid "Remaining Hours" msgstr "" -#. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_remaining_hours -#: model:ir.model.fields,field_description:project.field_project_task_history_remaining_hours -msgid "Remaining Time" -msgstr "" - #. module: project #. openerp-web #: code:addons/project/static/src/js/project.js:48 @@ -2575,6 +2513,11 @@ msgstr "" msgid "Reporting" msgstr "" +#. module: project +#: model:ir.ui.menu,name:project.menu_project_report +msgid "Reports" +msgstr "" + #. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:89 @@ -2592,12 +2535,6 @@ msgstr "" msgid "Responsibility" msgstr "" -#. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_user_id -#: model:ir.model.fields,field_description:project.field_project_task_history_user_id -msgid "Responsible" -msgstr "" - #. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Runs outside Odoo, always available" @@ -2660,6 +2597,7 @@ msgid "Set a Cover Image" msgstr "" #. module: project +#: model:ir.ui.menu,name:project.menu_project_general_settings #: model:ir.ui.view,arch_db:project.edit_project #: model:ir.ui.view,arch_db:project.view_project_kanban msgid "Settings" @@ -2719,11 +2657,8 @@ msgid "Sprint" msgstr "" #. module: project -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_type_id -#: model:ir.model.fields,field_description:project.field_project_task_history_type_id #: model:ir.model.fields,field_description:project.field_project_task_stage_id #: model:ir.model.fields,field_description:project.field_report_project_task_user_stage_id -#: model:ir.ui.view,arch_db:project.view_task_history_search #: model:ir.ui.view,arch_db:project.view_task_project_user_search #: model:ir.ui.view,arch_db:project.view_task_search_form msgid "Stage" @@ -2751,6 +2686,7 @@ msgstr "" #. module: project #: model:ir.actions.act_window,name:project.open_task_type_form +#: model:ir.ui.menu,name:project.menu_project_config_project msgid "Stages" msgstr "" @@ -2769,12 +2705,6 @@ msgstr "" msgid "Starting Date" msgstr "" -#. module: project -#: model:ir.model.fields,field_description:project.field_report_project_task_user_state -#: model:ir.ui.view,arch_db:project.view_task_history_search -msgid "Status" -msgstr "" - #. module: project #: sql_constraint:project.tags:0 msgid "Tag name already exists !" @@ -2796,10 +2726,7 @@ msgstr "" #. module: project #: model:ir.model,name:project.model_project_task -#: model:ir.model.fields,field_description:project.field_project_task_history_cumulative_task_id -#: model:ir.model.fields,field_description:project.field_project_task_history_task_id #: model:ir.ui.view,arch_db:project.view_task_form2 -#: model:ir.ui.view,arch_db:project.view_task_history_search #: model:ir.ui.view,arch_db:project.view_task_project_user_search #: model:ir.ui.view,arch_db:project.view_task_search_form msgid "Task" @@ -2897,11 +2824,6 @@ msgstr "" msgid "Task ready for Next Stage" msgstr "" -#. module: project -#: model:ir.ui.view,arch_db:project.view_task_history_search -msgid "Task's Analysis" -msgstr "" - #. module: project #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all #: model:ir.actions.act_window,name:project.action_view_task @@ -2910,7 +2832,6 @@ msgstr "" #: model:ir.model.fields,field_description:project.field_project_project_task_needaction_count #: model:ir.model.fields,field_description:project.field_res_partner_task_ids #: model:ir.ui.menu,name:project.menu_action_view_task -#: model:ir.ui.menu,name:project.menu_project_task_user_tree #: model:ir.ui.view,arch_db:project.edit_project #: model:ir.ui.view,arch_db:project.project_planner #: model:ir.ui.view,arch_db:project.view_project_kanban @@ -3048,6 +2969,7 @@ msgstr "" #. module: project #: model:ir.model.fields,help:project.field_account_analytic_account_company_uom_id +#: model:ir.model.fields,help:project.field_project_config_settings_project_time_mode_id #: model:ir.model.fields,help:project.field_project_project_company_uom_id #: model:ir.model.fields,help:project.field_res_company_project_time_mode_id #: model:ir.model.fields,help:project.project_time_mode_id_duplicate_xmlid @@ -3127,12 +3049,6 @@ msgid "Unassigned" msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_task_history_search -msgid "Unassigned Tasks" -msgstr "" - -#. module: project -#: model:ir.ui.view,arch_db:project.view_project_project_filter #: model:ir.ui.view,arch_db:project.view_task_kanban #: model:ir.ui.view,arch_db:project.view_task_search_form msgid "Unread Messages" @@ -3195,14 +3111,14 @@ msgid "View statistics for the week" msgstr "" #. module: project -#: code:addons/project/models/project.py:199 +#: code:addons/project/models/project.py:204 #: selection:project.project,privacy_visibility:0 #, python-format msgid "Visible by all employees" msgstr "" #. module: project -#: code:addons/project/models/project.py:200 +#: code:addons/project/models/project.py:205 #: selection:project.project,privacy_visibility:0 #, python-format msgid "Visible by following customers" @@ -3395,7 +3311,7 @@ msgid "and activate:" msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.edit_project_simplified +#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified msgid "e.g. Office Party" msgstr "" @@ -3424,18 +3340,13 @@ msgstr "" msgid "project.config.settings" msgstr "" -#. module: project -#: model:ir.model,name:project.model_project_task_history_cumulative -msgid "project.task.history.cumulative" -msgstr "" - #. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "send us an email" msgstr "" #. module: project -#: code:addons/project/models/project.py:460 +#: code:addons/project/models/project.py:472 #, python-format msgid "tasks" msgstr "" diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 3ca29ff91f9..0e118137a4f 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -111,6 +111,11 @@ msgstr "" msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" msgstr "" +#. module: purchase +#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration +msgid "(*) This configuration value is related to the company you're logged in." +msgstr "" + #. module: purchase #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document msgid "Date Req." @@ -327,7 +332,7 @@ msgid "Blocking Message" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:789 +#: code:addons/purchase/models/purchase.py:792 #: code:addons/purchase/models/stock.py:81 #: model:stock.location.route,name:purchase.route_warehouse0_buy #, python-format @@ -356,14 +361,7 @@ msgid "Calls for tenders are used when you want to generate requests for quotati msgstr "" #. module: purchase -#: model:ir.model.fields,field_description:purchase.field_product_product_purchase_ok -#: model:ir.model.fields,field_description:purchase.field_product_template_purchase_ok -#: model:ir.ui.view,arch_db:purchase.product_template_search_view_purchase -msgid "Can be Purchased" -msgstr "" - -#. module: purchase -#: code:addons/purchase/models/purchase.py:805 +#: code:addons/purchase/models/purchase.py:808 #, python-format msgid "Can not cancel a procurement related to a purchase order. Please cancel the purchase order first." msgstr "" @@ -387,7 +385,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:655 +#: code:addons/purchase/models/purchase.py:658 #, python-format msgid "Cannot delete a purchase order line which is in state '%s'." msgstr "" @@ -434,6 +432,7 @@ msgid "Companies" msgstr "" #. module: purchase +#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_company_id #: model:ir.model.fields,field_description:purchase.field_purchase_order_company_id #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_company_id #: model:ir.model.fields,field_description:purchase.field_purchase_report_company_id @@ -442,7 +441,7 @@ msgid "Company" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:291 +#: code:addons/purchase/models/purchase.py:294 #, python-format msgid "Compose Email" msgstr "" @@ -503,6 +502,7 @@ msgid "Created on" msgstr "" #. module: purchase +#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_company_currency_id #: model:ir.model.fields,field_description:purchase.field_purchase_order_currency_id #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_currency_id #: model:ir.model.fields,field_description:purchase.field_purchase_report_currency_id @@ -550,6 +550,11 @@ msgstr "" msgid "Description" msgstr "" +#. module: purchase +#: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit +msgid "Description for Vendors" +msgstr "" + #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_default_location_dest_id_usage msgid "Destination Location Type" @@ -573,6 +578,11 @@ msgstr "" msgid "Double validation amount" msgstr "" +#. module: purchase +#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_double_validation_amount +msgid "Double validation amount *" +msgstr "" + #. module: purchase #: selection:purchase.report,state:0 msgid "Draft RFQ" @@ -651,7 +661,7 @@ msgid "ID" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:194 +#: code:addons/purchase/models/purchase.py:197 #, python-format msgid "In order to delete a purchase order, you must cancel it first." msgstr "" @@ -733,6 +743,11 @@ msgstr "" msgid "Levels of Approvals" msgstr "" +#. module: purchase +#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_double_validation +msgid "Levels of Approvals *" +msgstr "" + #. module: purchase #: model:ir.ui.view,arch_db:purchase.view_purchase_configuration msgid "Location & Warehouse" @@ -748,6 +763,11 @@ msgstr "" msgid "Locked" msgstr "" +#. module: purchase +#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration +msgid "Logistics" +msgstr "" + #. module: purchase #: model:res.groups,name:purchase.group_manage_vendor_price msgid "Manage Vendor Price" @@ -769,6 +789,7 @@ msgid "Manual Invoices" msgstr "" #. module: purchase +#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_lead #: model:ir.model.fields,help:purchase.field_res_company_po_lead msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays." msgstr "" @@ -785,6 +806,7 @@ msgid "Message for Purchase Order Line" msgstr "" #. module: purchase +#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_double_validation_amount #: model:ir.model.fields,help:purchase.field_res_company_po_double_validation_amount msgid "Minimum amount for which a double validation is required" msgstr "" @@ -817,7 +839,7 @@ msgid "No variants on products" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:938 +#: code:addons/purchase/models/purchase.py:941 #, python-format msgid "No vendor associated to product %s. Please set one to fix this procurement." msgstr "" @@ -890,7 +912,7 @@ msgid "Order of Day" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:762 +#: code:addons/purchase/models/purchase.py:765 #, python-format msgid "Ordered quantity decreased!" msgstr "" @@ -910,6 +932,11 @@ msgstr "" msgid "PO_${(object.name or '').replace('/','_')}" msgstr "" +#. module: purchase +#: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit +msgid "Packaging" +msgstr "" + #. module: purchase #: model:ir.model,name:purchase.model_res_partner #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_partner_id @@ -928,7 +955,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_payment_term_id -msgid "Payment Term" +msgid "Payment Terms" msgstr "" #. module: purchase @@ -1031,6 +1058,7 @@ msgid "Products have only one unit of measure (easier)" msgstr "" #. module: purchase +#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_double_validation #: model:ir.model.fields,help:purchase.field_res_company_po_double_validation msgid "Provide a double validation mechanism for purchases" msgstr "" @@ -1060,6 +1088,11 @@ msgstr "" msgid "Purchase Lead Time" msgstr "" +#. module: purchase +#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_lead +msgid "Purchase Lead Time *" +msgstr "" + #. module: purchase #: model:ir.actions.report.xml,name:purchase.action_report_purchase_order #: model:ir.model,name:purchase.model_purchase_order @@ -1111,6 +1144,12 @@ msgid "Purchase Order Modification" msgstr "" #. module: purchase +#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_lock +msgid "Purchase Order Modification *" +msgstr "" + +#. module: purchase +#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_lock #: model:ir.model.fields,help:purchase.field_res_company_po_lock msgid "Purchase Order Modification used when you want to purchase order editable after confirm" msgstr "" @@ -1131,7 +1170,7 @@ msgid "Purchase Orders Statistics" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:657 +#: code:addons/purchase/models/purchase.py:660 #, python-format msgid "Purchase order line deleted." msgstr "" @@ -1158,6 +1197,7 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree +#: model:ir.ui.menu,name:purchase.menu_purchase_root #: model:ir.ui.view,arch_db:purchase.res_partner_view_purchase_buttons #: model:ir.ui.view,arch_db:purchase.view_product_template_purchase_buttons_from msgid "Purchases" @@ -1263,6 +1303,11 @@ msgstr "" msgid "Reference of the sales order or bid sent by the vendor. It's used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your vendor." msgstr "" +#. module: purchase +#: model:ir.ui.menu,name:purchase.purchase_report +msgid "Reports" +msgstr "" + #. module: purchase #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation #: model:ir.ui.view,arch_db:purchase.purchase_order_form @@ -1467,25 +1512,30 @@ msgid "This currency will be used, instead of the default one, for purchases fro msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:966 +#: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit +msgid "This note will be displayed on requests for quotation." +msgstr "" + +#. module: purchase +#: code:addons/purchase/models/purchase.py:969 #, python-format msgid "This purchase order has been created from: %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:979 +#: code:addons/purchase/models/purchase.py:982 #, python-format msgid "This purchase order has been modified from: %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/account_invoice.py:183 +#: code:addons/purchase/models/account_invoice.py:184 #, python-format msgid "This vendor bill has been created from: %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/account_invoice.py:197 +#: code:addons/purchase/models/account_invoice.py:198 #, python-format msgid "This vendor bill has been modified from: %s" msgstr "" @@ -1534,13 +1584,13 @@ msgid "Transfer" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:342 +#: code:addons/purchase/models/purchase.py:345 #, python-format msgid "Unable to cancel purchase order %s as some receptions have already been done." msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:345 +#: code:addons/purchase/models/purchase.py:348 #, python-format msgid "Unable to cancel this purchase order. You must first cancel related vendor bills." msgstr "" @@ -1602,6 +1652,11 @@ msgstr "" msgid "User" msgstr "" +#. module: purchase +#: model:ir.model.fields,help:purchase.field_purchase_config_settings_company_currency_id +msgid "Utility field to express amount currency" +msgstr "" + #. module: purchase #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document #: model:ir.ui.view,arch_db:purchase.report_purchasequotation_document @@ -1649,6 +1704,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_supplier_name +#: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit msgid "Vendors" msgstr "" @@ -1684,8 +1740,8 @@ msgid "Warning" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:248 -#: code:addons/purchase/models/purchase.py:723 +#: code:addons/purchase/models/purchase.py:251 +#: code:addons/purchase/models/purchase.py:726 #, python-format msgid "Warning for %s" msgstr "" @@ -1711,7 +1767,7 @@ msgid "Work with product variant allows you to define some variant of the same p msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:763 +#: code:addons/purchase/models/purchase.py:766 #, python-format msgid "You are decreasing the ordered quantity!\n" "You must update the quantities on the reception and/or bills." @@ -1738,13 +1794,13 @@ msgid "You must define a product for everything you purchase, whether\n" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:382 +#: code:addons/purchase/models/purchase.py:385 #, python-format msgid "You must set a Vendor Location for this partner %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:312 +#: code:addons/purchase/models/purchase.py:315 #, python-format msgid "You need purchase manager access rights to validate an order above %.2f %s." msgstr "" diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot index dce81090cf7..6df0b3a99be 100644 --- a/addons/rating/i18n/rating.pot +++ b/addons/rating/i18n/rating.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -334,7 +334,7 @@ msgstr "" #. module: rating #: model:ir.ui.view,arch_db:rating.rating_external_page_submit -msgid "Would be great if you can provide more informaion:" +msgid "Would be great if you can provide more information:" msgstr "" #. module: rating diff --git a/addons/rating_project/i18n/rating_project.pot b/addons/rating_project/i18n/rating_project.pot index 68b48b6106b..c51b0d1f194 100644 --- a/addons/rating_project/i18n/rating_project.pot +++ b/addons/rating_project/i18n/rating_project.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,8 +18,8 @@ msgstr "" #. module: rating_project #: model:mail.template,body_html:rating_project.rating_project_request_email_template msgid "\n" -"% set access_token = object.rating_get_access_token()\n" "
\n" +" % set access_token = object.rating_get_access_token()\n" "
\n" " \n" "
\n" diff --git a/addons/report/i18n/report.pot b/addons/report/i18n/report.pot index abc0d92434a..2c567f0140d 100644 --- a/addons/report/i18n/report.pot +++ b/addons/report/i18n/report.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -221,17 +221,17 @@ msgid "Edit" msgstr "" #. module: report -#: model:ir.ui.view,arch_db:report.reporting_settings_form_inherited +#: model:ir.ui.view,arch_db:report.base_config_settings_inherited msgid "Edit external footer" msgstr "" #. module: report -#: model:ir.ui.view,arch_db:report.reporting_settings_form_inherited +#: model:ir.ui.view,arch_db:report.base_config_settings_inherited msgid "Edit external header" msgstr "" #. module: report -#: model:ir.ui.view,arch_db:report.reporting_settings_form_inherited +#: model:ir.ui.view,arch_db:report.base_config_settings_inherited msgid "Edit internal header" msgstr "" @@ -375,6 +375,11 @@ msgstr "" msgid "Paper format" msgstr "" +#. module: report +#: model:ir.model.fields,field_description:report.field_base_config_settings_paperformat_id +msgid "Paper format *" +msgstr "" + #. module: report #: model:ir.ui.view,arch_db:report.paperformat_view_form #: model:ir.ui.view,arch_db:report.paperformat_view_tree @@ -398,13 +403,13 @@ msgstr "" #. module: report #: model:ir.actions.report.xml,name:report.action_report_externalpreview -#: model:ir.ui.view,arch_db:report.reporting_settings_form_inherited +#: model:ir.ui.view,arch_db:report.base_config_settings_inherited msgid "Preview External Report" msgstr "" #. module: report #: model:ir.actions.report.xml,name:report.action_report_internalpreview -#: model:ir.ui.view,arch_db:report.reporting_settings_form_inherited +#: model:ir.ui.view,arch_db:report.base_config_settings_inherited msgid "Preview Internal Report" msgstr "" @@ -531,6 +536,11 @@ msgid "You should upgrade your version of\n" "target=\"_blank\">wkhtmltopdf.org" msgstr "" +#. module: report +#: model:ir.model,name:report.model_base_config_settings +msgid "base.config.settings" +msgstr "" + #. module: report #: model:ir.model,name:report.model_ir_actions_report_xml msgid "ir.actions.report.xml" diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot index 7b8d162311d..6fd4ddb9076 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 9.saas~10c\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 14:07+0000\n" -"PO-Revision-Date: 2016-08-18 14:07+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "" #. module: report_intrastat #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document -msgid "Payment Term:" +msgid "Payment Terms:" msgstr "" #. module: report_intrastat diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 109c61462f5..482121a5a25 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,12 +18,13 @@ msgstr "" #. module: sale #: model:mail.template,body_html:sale.email_template_edi_sale msgid "\n" +"

Dear ${object.partner_id.name}\n" "% set access_action = object.get_access_action()\n" "% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n" "% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" "% set access_name = is_online and object.template_id and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n" "% set access_url = is_online and access_action['url'] or object.get_signup_url()\n" -"

Dear ${object.partner_id.name} \n" +"\n" "% if object.partner_id.parent_id:\n" " (${object.partner_id.parent_id.name})\n" "% endif\n" @@ -38,12 +39,14 @@ msgid "\n" "

\n" "\n" "

\n" +"% if is_online:\n" "
\n" " ${access_name}\n" "

\n" " (or view attached PDF)\n" "
\n" "
\n" +"% endif\n" "\n" "

You can reply to this email if you have any questions.

\n" "

Thank you,

\n" @@ -115,7 +118,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:44 +#: code:addons/sale/static/src/js/tour.js:83 #, python-format msgid "Invite salespeople or managers via email.
Enter one email per line." msgstr "" @@ -203,11 +206,16 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:21 +#: code:addons/sale/static/src/js/tour.js:64 #, python-format msgid "

Confirm the order if the customer purchases.

The customer can also confirm the order directly from the email he received.

" msgstr "" +#. module: sale +#: model:ir.ui.view,arch_db:sale.view_sales_config +msgid "(*) This configuration value is related to the company you're logged in." +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.report_saleorder_document msgid "Fiscal Position Remark:" @@ -215,7 +223,7 @@ msgstr "" #. module: sale #: model:ir.ui.view,arch_db:sale.report_saleorder_document -msgid "Payment Term:" +msgid "Payment Terms:" msgstr "" #. module: sale @@ -293,17 +301,17 @@ msgstr "" #. module: sale #: selection:sale.config.settings,sale_pricelist_setting:0 -msgid "Advanced pricing based on formula" +msgid "Advanced pricing based on formulas (discounts, margins, rounding)" msgstr "" #. module: sale #: selection:sale.config.settings,group_warning_sale:0 -msgid "All the products and the customers can be used in sale orders" +msgid "All the products and the customers can be used in sales orders" msgstr "" #. module: sale #: selection:sale.config.settings,module_product_visible_discount:0 -msgid "Allow discount policy on sale order line" +msgid "Allow discount policy on sales order line" msgstr "" #. module: sale @@ -316,11 +324,6 @@ msgstr "" msgid "Allow to edit sales order from the 'Sales Order' menu (not from the Quotation menu)" msgstr "" -#. module: sale -#: selection:sale.config.settings,module_sale_order_dates:0 -msgid "Allow to modify the sale order dates to postpone deliveries and procurements" -msgstr "" - #. module: sale #: model:ir.model.fields,help:sale.field_sale_config_settings_group_sale_pricelist msgid "Allows to manage different prices based on rules per category of customers.\n" @@ -449,9 +452,9 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:35 +#: code:addons/sale/static/src/js/tour.js:39 #, python-format -msgid "Click the Home icon to navigate across apps." +msgid "Click here to add some lines to your quotations." msgstr "" #. module: sale @@ -470,6 +473,7 @@ msgid "Companies" msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_company_id #: model:ir.model.fields,field_description:sale.field_sale_order_company_id #: model:ir.model.fields,field_description:sale.field_sale_order_line_company_id #: model:ir.model.fields,field_description:sale.field_sale_report_company_id @@ -479,7 +483,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:40 +#: code:addons/sale/static/src/js/tour.js:79 #, python-format msgid "Configuration options are available in the Settings app." msgstr "" @@ -570,12 +574,7 @@ msgstr "" #. module: sale #: model:ir.ui.view,arch_db:sale.view_sales_config -msgid "Customer portal" -msgstr "" - -#. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_order_dates -msgid "Date" +msgid "Customers" msgstr "" #. module: sale @@ -609,13 +608,13 @@ msgid "Default Terms and Conditions" msgstr "" #. module: sale -#: model:ir.model.fields,help:sale.field_sale_config_settings_deposit_product_id_setting -msgid "Default product used for payment advances" +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_note +msgid "Default Terms and Conditions *" msgstr "" #. module: sale -#: model:ir.ui.view,arch_db:sale.view_company_inherit_form2 -msgid "Default terms & conditions..." +#: model:ir.model.fields,help:sale.field_sale_config_settings_deposit_product_id_setting +msgid "Default product used for payment advances" msgstr "" #. module: sale @@ -667,8 +666,8 @@ msgid "Description" msgstr "" #. module: sale -#: selection:sale.config.settings,sale_pricelist_setting:0 -msgid "Different prices per customer segment" +#: model:ir.ui.view,arch_db:sale.view_sales_config +msgid "Digital Products" msgstr "" #. module: sale @@ -723,7 +722,7 @@ msgstr "" #. module: sale #: selection:sale.config.settings,group_sale_layout:0 -msgid "Do not personalize sale orders and invoice reports" +msgid "Do not personalize sales orders and invoice reports" msgstr "" #. module: sale @@ -773,11 +772,6 @@ msgstr "" msgid "Email composition wizard for Survey" msgstr "" -#. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_website_portal -msgid "Enable customer portal to track orders, delivery and invoices" -msgstr "" - #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_validity_date msgid "Expiration Date" @@ -1048,7 +1042,14 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:16 +#: code:addons/sale/static/src/js/tour.js:24 +#, python-format +msgid "Let's create a new quotation.
Note that colored buttons usually points to the next logical actions in any screen." +msgstr "" + +#. module: sale +#. openerp-web +#: code:addons/sale/static/src/js/tour.js:18 #, python-format msgid "Let's have a look at the quotations of this sales team." msgstr "" @@ -1130,7 +1131,7 @@ msgstr "" #. module: sale #: selection:sale.config.settings,auto_done_setting:0 -msgid "Never allow to modify a confirmed sale order" +msgid "Never allow to modify a confirmed sales order" msgstr "" #. module: sale @@ -1162,7 +1163,7 @@ msgstr "" #. module: sale #: selection:sale.config.settings,module_product_visible_discount:0 -msgid "No discount policy on sale order line" +msgid "No discount policy on sales order line" msgstr "" #. module: sale @@ -1176,15 +1177,15 @@ msgid "No variants on products" msgstr "" #. module: sale -#: model:ir.actions.act_window,help:sale.action_quotations +#: model:ir.actions.act_window,help:sale.action_quotations_salesteams msgid "Note that once a Quotation becomes a Sale Order, it will be moved\n" -" from the Quotations list to the Sales Order list." +" from the Quotations list to the Sales Order list." msgstr "" #. module: sale -#: model:ir.actions.act_window,help:sale.action_quotations_salesteams -msgid "Note that once a Quotation becomes a Sale Order, it will be moved \n" -" from the Quotations list to the Sales Order list." +#: model:ir.actions.act_window,help:sale.action_quotations +msgid "Note that once a Quotation becomes a Sale Order, it will be moved\n" +" from the Quotations list to the Sales Order list." msgstr "" #. module: sale @@ -1212,6 +1213,13 @@ msgid "Once the quotation is confirmed, it becomes a sales order.\n" " orders or services." msgstr "" +#. module: sale +#. openerp-web +#: code:addons/sale/static/src/js/tour.js:59 +#, python-format +msgid "Once your quotation is ready, you can save, print or send it by email." +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_website_quote msgid "Online Quotations" @@ -1310,7 +1318,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:11 +#: code:addons/sale/static/src/js/tour.js:13 #, python-format msgid "Organize your sales activities with the Sales app." msgstr "" @@ -1338,7 +1346,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_payment_term_id -msgid "Payment Term" +msgid "Payment Terms" msgstr "" #. module: sale @@ -1348,7 +1356,7 @@ msgstr "" #. module: sale #: selection:sale.config.settings,group_sale_layout:0 -msgid "Personalize the sale orders and invoice report with categories, subtotals and page-breaks" +msgid "Personalize the sales orders and invoice report with categories, subtotals and page-breaks" msgstr "" #. module: sale @@ -1358,7 +1366,7 @@ msgid "Please define an accounting sale journal for this company." msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:783 +#: code:addons/sale/models/sale.py:785 #, python-format msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"." msgstr "" @@ -1401,6 +1409,11 @@ msgstr "" msgid "Pricelists" msgstr "" +#. module: sale +#: model:ir.ui.view,arch_db:sale.view_sales_config +msgid "Pricing" +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.view_order_form msgid "Print" @@ -1426,11 +1439,6 @@ msgstr "" msgid "Procurements" msgstr "" -#. module: sale -#: selection:sale.config.settings,module_sale_order_dates:0 -msgid "Procurements and deliveries dates are based on the sale order dates" -msgstr "" - #. module: sale #: model:ir.model,name:sale.model_product_product #: model:ir.model.fields,field_description:sale.field_sale_order_line_product_id @@ -1621,11 +1629,6 @@ msgstr "" msgid "Reporting" msgstr "" -#. module: sale -#: selection:sale.order,state:0 -msgid "Sale Order" -msgstr "" - #. module: sale #: model:ir.model.fields,field_description:sale.field_account_analytic_line_so_line #: model:ir.model.fields,field_description:sale.field_procurement_order_sale_line_id @@ -1648,11 +1651,6 @@ msgstr "" msgid "Sale Price" msgstr "" -#. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_layout -msgid "Sale Reports Layout" -msgstr "" - #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_pricelist_setting msgid "Sale pricelist setting" @@ -1660,13 +1658,13 @@ msgstr "" #. module: sale #: model:ir.ui.menu,name:sale.menu_report_product_all +#: model:ir.ui.menu,name:sale.menu_sales_config #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban #: model:ir.ui.view,arch_db:sale.product_form_view_sale_order_button #: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button #: model:ir.ui.view,arch_db:sale.res_partner_view_buttons #: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation #: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_sale -#: model:ir.ui.view,arch_db:sale.view_company_inherit_form2 #: model:ir.ui.view,arch_db:sale.view_order_product_search msgid "Sales" msgstr "" @@ -1707,6 +1705,7 @@ msgstr "" #: model:ir.ui.view,arch_db:sale.view_order_form #: model:ir.ui.view,arch_db:sale.view_sales_order_filter #: model:res.request.link,name:sale.req_link_sale_order +#: selection:sale.order,state:0 #: selection:sale.report,state:0 msgid "Sales Order" msgstr "" @@ -1758,6 +1757,11 @@ msgstr "" msgid "Sales Orders Statistics" msgstr "" +#. module: sale +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_layout +msgid "Sales Reports Layout" +msgstr "" + #. module: sale #: model:ir.model,name:sale.model_crm_team #: model:ir.model.fields,field_description:sale.field_account_invoice_report_team_id @@ -1810,6 +1814,13 @@ msgstr "" msgid "Section" msgstr "" +#. module: sale +#. openerp-web +#: code:addons/sale/static/src/js/tour.js:44 +#, python-format +msgid "Select a product, or create a new one on the fly. The product will define the default sale price (that you can change), taxes and description automatically." +msgstr "" + #. module: sale #: model:ir.model.fields,help:sale.field_product_product_sale_line_warn #: model:ir.model.fields,help:sale.field_product_template_sale_line_warn @@ -1829,7 +1840,7 @@ msgstr "" #. module: sale #: selection:sale.config.settings,module_website_quote:0 -msgid "Send online quotations based on templates (advanced)" +msgid "Send quotations your customer can approve & pay online (advanced)" msgstr "" #. module: sale @@ -1862,7 +1873,7 @@ msgstr "" #. module: sale #: selection:sale.config.settings,group_display_incoterm:0 -msgid "Show incoterms on sale orders and invoices" +msgid "Show incoterms on sales orders and invoices" msgstr "" #. module: sale @@ -1907,6 +1918,11 @@ msgstr "" msgid "Source Document" msgstr "" +#. module: sale +#: selection:sale.config.settings,sale_pricelist_setting:0 +msgid "Specific prices per customer segment, currency, etc." +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_state #: model:ir.model.fields,field_description:sale.field_sale_report_state @@ -1968,6 +1984,12 @@ msgstr "" msgid "Terms and conditions" msgstr "" +#. module: sale +#: code:addons/sale/models/sale_analytic.py:86 +#, python-format +msgid "The Sale Order %s linked to the Analytic Account must be validated before registering expenses." +msgstr "" + #. module: sale #: model:ir.model.fields,help:sale.field_sale_advance_payment_inv_amount msgid "The amount to be invoiced in advance, taxes excluded." @@ -1981,7 +2003,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,help:sale.field_sale_config_settings_group_display_incoterm -msgid "The printed reports will display the incoterms for the sale orders and the related invoices" +msgid "The printed reports will display the incoterms for the sales orders and the related invoices" msgstr "" #. module: sale @@ -2135,14 +2157,14 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:26 +#: code:addons/sale/static/src/js/tour.js:69 #, python-format msgid "Use the breadcrumbs to go back to preceeding screens." msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:30 +#: code:addons/sale/static/src/js/tour.js:73 #, python-format msgid "Use this menu to access quotations, sales orders and customers." msgstr "" @@ -2165,7 +2187,7 @@ msgid "Warning" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:863 +#: code:addons/sale/models/sale.py:865 #, python-format msgid "Warning for %s" msgstr "" @@ -2191,6 +2213,13 @@ msgid "Work with product variant allows you to define some variant of the same p " , an ease the product management in the ecommerce for example" msgstr "" +#. module: sale +#. openerp-web +#: code:addons/sale/static/src/js/tour.js:29 +#, python-format +msgid "Write the name of your customer to create one on the fly, or select an existing one." +msgstr "" + #. module: sale #. openerp-web #: code:addons/sale/static/src/js/sale.js:26 @@ -2205,7 +2234,7 @@ msgid "You can not delete a sent quotation or a sales order! Try to cancel it be msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:892 +#: code:addons/sale/models/sale.py:894 #, python-format msgid "You can not remove a sale order line.\n" "Discard changes and try setting the quantity to 0." @@ -2223,15 +2252,15 @@ msgid "You will find here all orders that are ready to be invoiced." msgstr "" #. module: sale -#: model:ir.actions.act_window,help:sale.action_quotations +#: model:ir.actions.act_window,help:sale.action_quotations_salesteams msgid "Your next actions should flow efficiently: confirm the Quotation\n" -" to a Sale Order, then create the Invoice and collect the Payment." +" to a Sale Order, then create the Invoice and collect the Payment." msgstr "" #. module: sale -#: model:ir.actions.act_window,help:sale.action_quotations_salesteams -msgid "Your next actions should flow efficiently: confirm the Quotation \n" -" to a Sale Order, then create the Invoice and collect the Payment." +#: model:ir.actions.act_window,help:sale.action_quotations +msgid "Your next actions should flow efficiently: confirm the Quotation\n" +" to a Sale Order, then create the Invoice and collect the Payment." msgstr "" #. module: sale diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot index 7e1d1c4e7b3..4f91fc11c9c 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 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,6 +26,11 @@ msgstr "" msgid "Incoterms:" msgstr "" +#. module: sale_stock +#: model:ir.ui.menu,name:sale_stock.menu_aftersale +msgid "After-Sale" +msgstr "" + #. module: sale_stock #: selection:sale.config.settings,module_delivery:0 msgid "Allow adding shipping costs" @@ -36,6 +41,11 @@ msgstr "" msgid "Allow setting manufacturing order properties per order line (advanced)" msgstr "" +#. module: sale_stock +#: selection:sale.config.settings,module_sale_order_dates:0 +msgid "Allow to modify the sales order dates to postpone deliveries and procurements" +msgstr "" + #. module: sale_stock #: model:ir.model.fields,help:sale_stock.field_sale_config_settings_group_mrp_properties msgid "Allows you to tag sales order lines with properties." @@ -51,6 +61,11 @@ msgstr "" msgid "Companies" msgstr "" +#. module: sale_stock +#: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_module_sale_order_dates +msgid "Date" +msgstr "" + #. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_default_picking_policy msgid "Default Shipping Policy" @@ -117,8 +132,14 @@ msgstr "" msgid "Invoice Line" msgstr "" +#. module: sale_stock +#: model:ir.ui.menu,name:sale_stock.menu_invoiced +msgid "Invoicing" +msgstr "" + #. module: sale_stock #: model:ir.model.fields,help:sale_stock.field_res_company_security_lead +#: model:ir.model.fields,help:sale_stock.field_sale_config_settings_security_lead msgid "Margin of error for dates promised to customers. Products will be scheduled for procurement and delivery that many days earlier than the actual promised date, to cope with unexpected delays in the supply chain." msgstr "" @@ -164,6 +185,11 @@ msgstr "" msgid "Procurement" msgstr "" +#. module: sale_stock +#: selection:sale.config.settings,module_sale_order_dates:0 +msgid "Procurements and deliveries dates are based on the sales order dates" +msgstr "" + #. module: sale_stock #: model:ir.model,name:sale_stock.model_product_product msgid "Product" @@ -219,6 +245,11 @@ msgstr "" msgid "Sales Safety Days" msgstr "" +#. module: sale_stock +#: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_security_lead +msgid "Sales Safety Days *" +msgstr "" + #. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_stock_location_route_sale_selectable msgid "Selectable on Sales Order Line" diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot index 92c68f38045..25af6891094 100644 --- a/addons/sale_timesheet/i18n/sale_timesheet.pot +++ b/addons/sale_timesheet/i18n/sale_timesheet.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+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: sale_timesheet +#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_account_id +msgid "Account" +msgstr "" + #. module: sale_timesheet #: model:ir.model,name:sale_timesheet.model_account_analytic_line msgid "Analytic Line" @@ -108,8 +113,8 @@ msgid "Task" msgstr "" #. module: sale_timesheet -#: code:addons/sale_timesheet/models/procurement.py:72 -#: code:addons/sale_timesheet/models/procurement.py:74 +#: code:addons/sale_timesheet/models/procurement.py:80 +#: code:addons/sale_timesheet/models/procurement.py:82 #, python-format msgid "Task created" msgstr "" diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot index 183d38daba6..e1b3484c8ac 100644 --- a/addons/sales_team/i18n/sales_team.pot +++ b/addons/sales_team/i18n/sales_team.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -81,10 +81,16 @@ msgid "Archived" msgstr "" #. module: sales_team +#: model:ir.ui.menu,name:sales_team.menu_action_res_partner_bank_form #: model:ir.ui.menu,name:sales_team.menu_config_bank_accounts msgid "Bank Accounts" msgstr "" +#. module: sales_team +#: model:ir.ui.menu,name:sales_team.menu_action_res_bank_form +msgid "Banks" +msgstr "" + #. module: sales_team #: model:ir.ui.view,arch_db:sales_team.view_sale_config_settings msgid "Cancel" @@ -123,7 +129,6 @@ msgstr "" #. module: sales_team #: model:ir.ui.menu,name:sales_team.menu_sale_config -#: model:ir.ui.menu,name:sales_team.menu_sale_config_sales msgid "Configuration" msgstr "" @@ -177,6 +182,11 @@ msgstr "" msgid "Created on" msgstr "" +#. module: sales_team +#: model:ir.ui.menu,name:sales_team.menu_action_currency_form +msgid "Currencies" +msgstr "" + #. module: sales_team #: model:ir.ui.menu,name:sales_team.menu_partner_form msgid "Customers" @@ -280,11 +290,6 @@ msgstr "" msgid "Last Updated on" msgstr "" -#. module: sales_team -#: model:ir.ui.menu,name:sales_team.menu_crm_config_lead -msgid "Leads & Opportunities" -msgstr "" - #. module: sales_team #: model:ir.ui.menu,name:sales_team.menu_localisation msgid "Localization" @@ -347,11 +352,6 @@ msgstr "" msgid "Only Integer Value should be valid." msgstr "" -#. module: sales_team -#: model:ir.ui.menu,name:sales_team.menu_crm_config_opportunity -msgid "Opportunities" -msgstr "" - #. module: sales_team #: model:ir.model,name:sales_team.model_res_partner msgid "Partner" @@ -369,6 +369,11 @@ msgstr "" msgid "Reply-To" msgstr "" +#. module: sales_team +#: model:ir.ui.menu,name:sales_team.menu_sale_report +msgid "Reports" +msgstr "" + #. module: sales_team #: model:ir.model.fields,field_description:sales_team.field_res_users_property_product_pricelist msgid "Sale Pricelist" @@ -377,7 +382,6 @@ msgstr "" #. module: sales_team #: model:ir.ui.menu,name:sales_team.menu_base_partner #: model:ir.ui.menu,name:sales_team.menu_sales -#: model:ir.ui.menu,name:sales_team.menu_sales_config msgid "Sales" msgstr "" @@ -400,6 +404,7 @@ msgstr "" #. module: sales_team #: model:ir.actions.act_window,name:sales_team.crm_team_act #: model:ir.actions.act_window,name:sales_team.sales_team_config_action +#: model:ir.ui.menu,name:sales_team.sales_team_config msgid "Sales Teams" msgstr "" @@ -551,6 +556,11 @@ msgstr "" msgid "Users" msgstr "" +#. module: sales_team +#: model:crm.team,name:sales_team.salesteam_website_sales +msgid "Website Sales" +msgstr "" + #. module: sales_team #. openerp-web #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:127 diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index d4d73ea572d..6b1c23dfd72 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1587,7 +1587,7 @@ msgid "Delay (days)" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:340 +#: code:addons/stock/models/product.py:348 #, python-format msgid "Delivered Qty" msgstr "" @@ -1842,7 +1842,7 @@ msgid "Every stock operation in Odoo moves the products from one\n" msgstr "" #. module: stock -#: code:addons/stock/models/stock_quant.py:629 +#: code:addons/stock/models/stock_quant.py:647 #, python-format msgid "Everything inside a package should be in the same location" msgstr "" @@ -1940,7 +1940,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:335 +#: code:addons/stock/models/product.py:343 #: model:ir.model.fields,field_description:stock.field_product_template_virtual_available #: model:ir.model.fields,field_description:stock.field_stock_move_availability #, python-format @@ -1958,31 +1958,31 @@ msgid "Full Location Name" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:338 +#: code:addons/stock/models/product.py:346 #, python-format msgid "Future Deliveries" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:343 +#: code:addons/stock/models/product.py:351 #, python-format msgid "Future P&L" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:353 +#: code:addons/stock/models/product.py:361 #, python-format msgid "Future Productions" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:348 +#: code:addons/stock/models/product.py:356 #, python-format msgid "Future Qty" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:330 +#: code:addons/stock/models/product.py:338 #, python-format msgid "Future Receipts" msgstr "" @@ -2129,7 +2129,7 @@ msgstr "" #: model:ir.model.fields,field_description:stock.field_stock_picking_type_id #: model:ir.model.fields,field_description:stock.field_stock_production_lot_id #: model:ir.model.fields,field_description:stock.field_stock_quant_id -#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8249 +#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8292 #: model:ir.model.fields,field_description:stock.field_stock_return_picking_id #: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_id #: model:ir.model.fields,field_description:stock.field_stock_scrap_id @@ -2398,6 +2398,11 @@ msgstr "" msgid "Internal" msgstr "" +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_template_property_form +msgid "Internal Category" +msgstr "" + #. module: stock #: selection:stock.location,usage:0 msgid "Internal Location" @@ -2484,6 +2489,7 @@ msgstr "" #: model:ir.model.fields,field_description:stock.field_stock_move_inventory_id #: model:ir.ui.menu,name:stock.menu_stock_root #: model:ir.ui.view,arch_db:stock.view_stock_quant_pivot +#: model:ir.ui.view,arch_db:stock.view_template_property_form msgid "Inventory" msgstr "" @@ -3624,7 +3630,7 @@ msgid "Original location id" msgstr "" #. module: stock -#: code:addons/stock/models/stock_quant.py:246 +#: code:addons/stock/models/stock_quant.py:222 #, python-format msgid "Otherwise make sure the right stock/owner is set." msgstr "" @@ -3685,7 +3691,7 @@ msgid "Owner of the quants" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:345 +#: code:addons/stock/models/product.py:353 #, python-format msgid "P&L Qty" msgstr "" @@ -4146,7 +4152,7 @@ msgid "Procurements" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:355 +#: code:addons/stock/models/product.py:363 #, python-format msgid "Produced Qty" msgstr "" @@ -4283,7 +4289,7 @@ msgid "Products you scrap will be removed from the stock and moved to a specific msgstr "" #. module: stock -#: code:addons/stock/models/product.py:318 +#: code:addons/stock/models/product.py:326 #, python-format msgid "Products: " msgstr "" @@ -4521,7 +4527,7 @@ msgid "Receive goods directly in stock (1 step)" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:332 +#: code:addons/stock/models/product.py:340 #, python-format msgid "Received Qty" msgstr "" @@ -4608,7 +4614,7 @@ msgid "Removal Strategy" msgstr "" #. module: stock -#: code:addons/stock/models/stock_quant.py:449 +#: code:addons/stock/models/stock_quant.py:467 #, python-format msgid "Removal strategy %s not implemented." msgstr "" @@ -4808,6 +4814,11 @@ msgstr "" msgid "Run Schedulers" msgstr "" +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_template_property_form +msgid "Sale Conditions" +msgstr "" + #. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Sales Flow" @@ -5503,7 +5514,7 @@ msgid "The selected inventory options are not coherent." msgstr "" #. module: stock -#: code:addons/stock/models/stock_quant.py:246 +#: code:addons/stock/models/stock_quant.py:222 #, python-format msgid "The serial number %s is already in stock." msgstr "" @@ -5767,7 +5778,7 @@ msgid "Tracking" msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:959 +#: code:addons/stock/models/stock_move.py:958 #: model:ir.model,name:stock.model_stock_picking #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban #: model:ir.ui.view,arch_db:stock.view_picking_form @@ -5889,7 +5900,7 @@ msgid "Units of Measures" msgstr "" #. module: stock -#: code:addons/stock/models/stock_quant.py:551 +#: code:addons/stock/models/stock_quant.py:569 #, python-format msgid "Unknown Pack" msgstr "" @@ -5915,7 +5926,7 @@ msgid "Unpack" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:350 +#: code:addons/stock/models/product.py:358 #, python-format msgid "Unplanned Qty" msgstr "" @@ -6050,6 +6061,11 @@ msgstr "" msgid "Virtual Locations" msgstr "" +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_template_property_form +msgid "Volume" +msgstr "" + #. module: stock #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban msgid "Waiting" @@ -6156,7 +6172,7 @@ msgid "Warning on the Picking" msgstr "" #. module: stock -#: code:addons/stock/models/product.py:311 +#: code:addons/stock/models/product.py:319 #, python-format msgid "Warning!" msgstr "" @@ -6282,7 +6298,7 @@ msgid "You can either do it immediately or mark it as Todo for future processing msgstr "" #. module: stock -#: code:addons/stock/models/product.py:478 +#: code:addons/stock/models/product.py:486 #, python-format msgid "You can not change the unit of measure of a product that has already been used in a done stock move. If you need to change the unit of measure, you may deactivate this product." msgstr "" @@ -6342,13 +6358,13 @@ msgid "You cannot set a negative product quantity in an inventory line:\n" msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:918 +#: code:addons/stock/models/stock_move.py:919 #, python-format msgid "You cannot split a draft move. It needs to be confirmed first." msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:914 +#: code:addons/stock/models/stock_move.py:915 #, python-format msgid "You cannot split a move done" msgstr "" @@ -6387,7 +6403,7 @@ msgid "You have processed less products than the initial demand." msgstr "" #. module: stock -#: code:addons/stock/models/product.py:312 +#: code:addons/stock/models/product.py:320 #, python-format msgid "You have products in stock that have no lot number. You can assign serial numbers by doing an inventory. " msgstr "" @@ -6418,7 +6434,7 @@ msgid "You need to provide a Lot/Serial Number for product %s" msgstr "" #. module: stock -#: code:addons/stock/models/stock_quant.py:241 +#: code:addons/stock/models/stock_quant.py:260 #, python-format msgid "You should only receive by the piece with the same serial number" msgstr "" @@ -6488,9 +6504,9 @@ msgid "configuration menu" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button #: model:ir.ui.view,arch_db:stock.stock_location_path_form #: model:ir.ui.view,arch_db:stock.view_procurement_rule_form_stock_inherit +#: model:ir.ui.view,arch_db:stock.view_template_property_form msgid "days" msgstr "" @@ -6545,6 +6561,11 @@ msgstr "" msgid "is displayed on the transfer if your products supply chain is properly configured. Otherwise, Check the availability manually" msgstr "" +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_template_property_form +msgid "months" +msgstr "" + #. module: stock #: model:ir.ui.view,arch_db:stock.view_pack_operation_lot_form #: model:ir.ui.view,arch_db:stock.view_picking_form diff --git a/addons/stock_dropshipping/i18n/stock_dropshipping.pot b/addons/stock_dropshipping/i18n/stock_dropshipping.pot index be7a7413e94..8c28744e32f 100644 --- a/addons/stock_dropshipping/i18n/stock_dropshipping.pot +++ b/addons/stock_dropshipping/i18n/stock_dropshipping.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.saas~10c\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 14:08+0000\n" -"PO-Revision-Date: 2016-08-18 14:08+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -25,6 +25,11 @@ msgstr "" msgid "Dropship" msgstr "" +#. module: stock_dropshipping +#: model:ir.model,name:stock_dropshipping.model_account_invoice +msgid "Invoice" +msgstr "" + #. module: stock_dropshipping #: model:procurement.rule,name:stock_dropshipping.procurement_rule_drop_shipping msgid "Vendor → Customer" diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot index 8cc52fe21a3..d3443b98564 100644 --- a/addons/survey/i18n/survey.pot +++ b/addons/survey/i18n/survey.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -687,6 +687,11 @@ msgstr "" msgid "Login required" msgstr "" +#. module: survey +#: model:res.groups,name:survey.group_survey_manager +msgid "Manager" +msgstr "" + #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_question_constr_mandatory #: model:ir.ui.view,arch_db:survey.survey_question_form @@ -911,7 +916,6 @@ msgstr "" #. module: survey #: model:ir.actions.act_window,name:survey.action_partner_survey_mail -#: model:ir.actions.act_window,name:survey.action_partner_survey_mail_crm msgid "Partner Survey Mailing" msgstr "" @@ -1468,6 +1472,11 @@ msgstr "" msgid "Use this field to add additional explanations about your question" msgstr "" +#. module: survey +#: model:res.groups,name:survey.group_survey_user +msgid "User" +msgstr "" + #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_user_input_line_user_input_id #: model:ir.ui.view,arch_db:survey.survey_response_line_search @@ -1604,10 +1613,3 @@ msgstr "" msgid "review your answers" msgstr "" -#. module: survey -#. openerp-web -#: code:addons/survey/static/src/js/tour_test_survey.js:10 -#, python-format -msgid "try to create and fill survey" -msgstr "" - diff --git a/addons/survey_crm/i18n/survey_crm.pot b/addons/survey_crm/i18n/survey_crm.pot index 1e4f6700955..f696f312b8a 100644 --- a/addons/survey_crm/i18n/survey_crm.pot +++ b/addons/survey_crm/i18n/survey_crm.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.saas~10c\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 14:08+0000\n" -"PO-Revision-Date: 2016-08-18 14:08+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,3 +20,8 @@ msgstr "" msgid "Email composition wizard for Survey" msgstr "" +#. module: survey_crm +#: model:ir.actions.act_window,name:survey_crm.action_partner_survey_mail_crm +msgid "Partner Survey Mailing" +msgstr "" + diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot index 18d3c36dada..98ac9e88109 100644 --- a/addons/web/i18n/web.pot +++ b/addons/web/i18n/web.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -96,7 +96,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:138 +#: code:addons/web/static/src/js/widgets/debug_manager.js:137 #, python-format msgid "%d requests (%d ms) %d queries (%d ms)" msgstr "" @@ -115,6 +115,13 @@ msgstr "" msgid "%s (%d)" msgstr "" +#. module: web +#: model:ir.ui.view,arch_db:web.webclient_bootstrap +msgid "<!--[if lt IE 10]>\n" +" <body class=\"ie9\">\n" +" <![endif]-->" +msgstr "" + #. module: web #. openerp-web #: code:addons/web/static/src/js/framework/formats.js:177 @@ -187,7 +194,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:913 +#: code:addons/web/static/src/xml/base.xml:891 #, python-format msgid "...Upload in progress..." msgstr "" @@ -218,7 +225,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1305 +#: code:addons/web/static/src/xml/base.xml:1283 #, python-format msgid "Access to all Enterprise Apps" msgstr "" @@ -269,21 +276,21 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_relational_widgets.js:1369 -#: code:addons/web/static/src/xml/base.xml:1129 +#: code:addons/web/static/src/xml/base.xml:1107 #, python-format msgid "Add" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:954 +#: code:addons/web/static/src/xml/base.xml:932 #, python-format msgid "Add Custom Filter" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:958 +#: code:addons/web/static/src/xml/base.xml:936 #, python-format msgid "Add a condition" msgstr "" @@ -297,14 +304,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1064 +#: code:addons/web/static/src/xml/base.xml:1042 #, python-format msgid "Add custom group" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:271 +#: code:addons/web/static/src/xml/base.xml:250 #, python-format msgid "Add..." msgstr "" @@ -318,7 +325,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:930 +#: code:addons/web/static/src/xml/base.xml:908 #, python-format msgid "Advanced Search..." msgstr "" @@ -332,22 +339,22 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:500 +#: code:addons/web/static/src/xml/base.xml:479 #, python-format msgid "All users" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1310 +#: code:addons/web/static/src/xml/base.xml:1288 #, python-format msgid "And more" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:957 -#: code:addons/web/static/src/xml/base.xml:1075 +#: code:addons/web/static/src/xml/base.xml:935 +#: code:addons/web/static/src/xml/base.xml:1053 #, python-format msgid "Apply" msgstr "" @@ -376,21 +383,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:245 +#: code:addons/web/static/src/xml/base.xml:224 #, python-format msgid "Attachment :" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1125 +#: code:addons/web/static/src/xml/base.xml:1103 #, python-format msgid "Available fields" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:567 +#: code:addons/web/static/src/xml/base.xml:546 #, python-format msgid "Bar Chart" msgstr "" @@ -404,7 +411,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1309 +#: code:addons/web/static/src/xml/base.xml:1287 #, python-format msgid "Bugfixes guarantee" msgstr "" @@ -451,10 +458,10 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/controllers/main.py:719 -#: code:addons/web/controllers/main.py:721 -#: code:addons/web/controllers/main.py:727 -#: code:addons/web/controllers/main.py:728 +#: code:addons/web/controllers/main.py:716 +#: code:addons/web/controllers/main.py:718 +#: code:addons/web/controllers/main.py:723 +#: code:addons/web/controllers/main.py:724 #: code:addons/web/static/src/js/widgets/change_password.js:15 #: code:addons/web/static/src/xml/base.xml:55 #, python-format @@ -477,15 +484,15 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:834 -#: code:addons/web/static/src/xml/base.xml:864 +#: code:addons/web/static/src/xml/base.xml:813 +#: code:addons/web/static/src/xml/base.xml:842 #, python-format msgid "Clear" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:120 +#: code:addons/web/static/src/xml/base.xml:119 #, python-format msgid "Clear Events" msgstr "" @@ -509,7 +516,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:474 +#: code:addons/web/static/src/xml/base.xml:453 #, python-format msgid "Condition:" msgstr "" @@ -551,7 +558,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1254 +#: code:addons/web/static/src/js/views/form_widgets.js:1248 #, python-format msgid "Could not display the selected image." msgstr "" @@ -575,8 +582,8 @@ msgstr "" #: code:addons/web/static/src/js/views/graph_view.js:87 #: code:addons/web/static/src/js/views/graph_widget.js:22 #: code:addons/web/static/src/js/views/pivot_view.js:182 -#: code:addons/web/static/src/xml/base.xml:563 -#: code:addons/web/static/src/xml/base.xml:592 +#: code:addons/web/static/src/xml/base.xml:542 +#: code:addons/web/static/src/xml/base.xml:571 #, python-format msgid "Count" msgstr "" @@ -587,7 +594,7 @@ msgstr "" #: code:addons/web/static/src/js/views/form_relational_widgets.js:28 #: code:addons/web/static/src/js/views/list_view.js:49 #: code:addons/web/static/src/js/views/list_view.js:1926 -#: code:addons/web/static/src/xml/base.xml:436 +#: code:addons/web/static/src/xml/base.xml:415 #, python-format msgid "Create" msgstr "" @@ -630,21 +637,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:250 +#: code:addons/web/static/src/xml/base.xml:229 #, python-format msgid "Created by :" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:204 +#: code:addons/web/static/src/xml/base.xml:183 #, python-format msgid "Creation Date:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:200 +#: code:addons/web/static/src/xml/base.xml:179 #, python-format msgid "Creation User:" msgstr "" @@ -664,7 +671,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:611 +#: code:addons/web/static/src/xml/base.xml:590 #, python-format msgid "Day" msgstr "" @@ -678,7 +685,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:457 +#: code:addons/web/static/src/xml/base.xml:436 #, python-format msgid "Default:" msgstr "" @@ -687,21 +694,21 @@ msgstr "" #. openerp-web #: code:addons/web/static/src/js/views/form_view.js:163 #: code:addons/web/static/src/js/views/list_view.js:291 -#: code:addons/web/static/src/xml/base.xml:1170 +#: code:addons/web/static/src/xml/base.xml:1148 #, python-format msgid "Delete" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:261 +#: code:addons/web/static/src/xml/base.xml:240 #, python-format msgid "Delete this attachment" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:918 +#: code:addons/web/static/src/xml/base.xml:896 #, python-format msgid "Delete this file" msgstr "" @@ -716,8 +723,8 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:868 -#: code:addons/web/static/src/xml/base.xml:368 -#: code:addons/web/static/src/xml/base.xml:446 +#: code:addons/web/static/src/xml/base.xml:347 +#: code:addons/web/static/src/xml/base.xml:425 #, python-format msgid "Discard" msgstr "" @@ -745,7 +752,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1290 +#: code:addons/web/static/src/xml/base.xml:1268 #, python-format msgid "Documentation" msgstr "" @@ -780,7 +787,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:598 +#: code:addons/web/static/src/xml/base.xml:577 #, python-format msgid "Download xls" msgstr "" @@ -794,31 +801,31 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:180 -#: code:addons/web/static/src/xml/base.xml:432 -#: code:addons/web/static/src/xml/base.xml:833 +#: code:addons/web/static/src/xml/base.xml:159 +#: code:addons/web/static/src/xml/base.xml:411 +#: code:addons/web/static/src/xml/base.xml:812 #, python-format msgid "Edit" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:148 +#: code:addons/web/static/src/xml/base.xml:127 #, python-format msgid "Edit Action" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:181 +#: code:addons/web/static/src/xml/base.xml:160 #, python-format msgid "Edit SearchView" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:279 -#: code:addons/web/static/src/xml/base.xml:152 +#: code:addons/web/static/src/js/widgets/debug_manager.js:265 +#: code:addons/web/static/src/xml/base.xml:131 #, python-format msgid "Edit Workflow" msgstr "" @@ -835,13 +842,6 @@ msgstr "" msgid "Enable Technical Features" msgstr "" -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/website.tour.xml:25 -#, python-format -msgid "End This Tutorial" -msgstr "" - #. module: web #. openerp-web #: code:addons/web/static/src/js/view_manager.js:222 @@ -852,7 +852,7 @@ msgid "Error" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:728 +#: code:addons/web/controllers/main.py:724 #, python-format msgid "Error, password not changed !" msgstr "" @@ -873,7 +873,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:597 +#: code:addons/web/static/src/xml/base.xml:576 #, python-format msgid "Expand all" msgstr "" @@ -894,7 +894,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1118 +#: code:addons/web/static/src/xml/base.xml:1096 #, python-format msgid "Export Formats :" msgstr "" @@ -908,14 +908,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1111 +#: code:addons/web/static/src/xml/base.xml:1089 #, python-format msgid "Export Type :" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1114 +#: code:addons/web/static/src/xml/base.xml:1092 #, python-format msgid "Export all Data" msgstr "" @@ -929,7 +929,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1081 +#: code:addons/web/static/src/xml/base.xml:1059 #, python-format msgid "Favorites" msgstr "" @@ -950,36 +950,36 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:360 -#: code:addons/web/static/src/xml/base.xml:178 +#: code:addons/web/static/src/js/widgets/debug_manager.js:346 +#: code:addons/web/static/src/xml/base.xml:157 #, python-format msgid "Fields View Get" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:257 +#: code:addons/web/static/src/js/widgets/debug_manager.js:243 #, python-format msgid "Fields of %s" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1137 +#: code:addons/web/static/src/xml/base.xml:1115 #, python-format msgid "Fields to export" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1117 +#: code:addons/web/static/src/js/views/form_widgets.js:1111 #, python-format msgid "File Upload" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1097 +#: code:addons/web/static/src/js/views/form_widgets.js:1091 #, python-format msgid "File upload" msgstr "" @@ -1014,21 +1014,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:950 +#: code:addons/web/static/src/xml/base.xml:928 #, python-format msgid "Filters" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:596 +#: code:addons/web/static/src/xml/base.xml:575 #, python-format msgid "Flip axis" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/pivot_view.js:821 +#: code:addons/web/static/src/js/views/pivot_view.js:820 #, python-format msgid "For Excel compatibility, data cannot be exported if there are more than 256 columns.\n" "\n" @@ -1045,7 +1045,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1302 +#: code:addons/web/static/src/xml/base.xml:1280 #, python-format msgid "Get this feature and much more with Odoo Enterprise!" msgstr "" @@ -1067,7 +1067,7 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search_inputs.js:699 -#: code:addons/web/static/src/xml/base.xml:1059 +#: code:addons/web/static/src/xml/base.xml:1037 #, python-format msgid "Group By" msgstr "" @@ -1093,28 +1093,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:130 -#, python-format -msgid "ID" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:188 +#: code:addons/web/static/src/xml/base.xml:167 #, python-format msgid "ID:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1254 +#: code:addons/web/static/src/js/views/form_widgets.js:1248 #, python-format msgid "Image" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1113 +#: code:addons/web/static/src/xml/base.xml:1091 #, python-format msgid "Import-Compatible Export" msgstr "" @@ -1136,41 +1129,41 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:199 +#: code:addons/web/static/src/js/widgets/debug_manager.js:185 #, python-format msgid "JS Tests" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:735 +#: code:addons/web/controllers/main.py:731 #, python-format msgid "Languages" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:212 +#: code:addons/web/static/src/xml/base.xml:191 #, python-format msgid "Latest Modification Date:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:208 +#: code:addons/web/static/src/xml/base.xml:187 #, python-format msgid "Latest Modification by:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:123 +#: code:addons/web/static/src/xml/base.xml:122 #, python-format msgid "Leave the Developer Tools" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:568 +#: code:addons/web/static/src/xml/base.xml:547 #, python-format msgid "Line Chart" msgstr "" @@ -1220,7 +1213,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1295 +#: code:addons/web/static/src/xml/base.xml:1273 #, python-format msgid "Log out" msgstr "" @@ -1246,8 +1239,8 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:267 -#: code:addons/web/static/src/xml/base.xml:151 +#: code:addons/web/static/src/js/widgets/debug_manager.js:253 +#: code:addons/web/static/src/xml/base.xml:130 #, python-format msgid "Manage Filters" msgstr "" @@ -1261,15 +1254,15 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:555 -#: code:addons/web/static/src/xml/base.xml:584 +#: code:addons/web/static/src/xml/base.xml:534 +#: code:addons/web/static/src/xml/base.xml:563 #, python-format msgid "Measures" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:347 +#: code:addons/web/static/src/js/widgets/debug_manager.js:333 #, python-format msgid "Metadata (%s)" msgstr "" @@ -1290,14 +1283,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1307 +#: code:addons/web/static/src/xml/base.xml:1285 #, python-format msgid "Mobile support" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:255 +#: code:addons/web/static/src/xml/base.xml:234 #, python-format msgid "Modified by :" msgstr "" @@ -1311,14 +1304,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:613 +#: code:addons/web/static/src/xml/base.xml:592 #, python-format msgid "Month" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:813 +#: code:addons/web/static/src/xml/base.xml:792 #, python-format msgid "More" msgstr "" @@ -1330,35 +1323,28 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1133 +#: code:addons/web/static/src/xml/base.xml:1111 #, python-format msgid "Move Down" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1132 +#: code:addons/web/static/src/xml/base.xml:1110 #, python-format msgid "Move Up" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1294 +#: code:addons/web/static/src/xml/base.xml:1272 #, python-format msgid "My Odoo.com account" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:131 -#, python-format -msgid "Name" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1187 +#: code:addons/web/static/src/xml/base.xml:1165 #, python-format msgid "Name:" msgstr "" @@ -1379,7 +1365,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1306 +#: code:addons/web/static/src/xml/base.xml:1284 #, python-format msgid "New design" msgstr "" @@ -1393,7 +1379,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:196 +#: code:addons/web/static/src/xml/base.xml:175 #, python-format msgid "No Update:" msgstr "" @@ -1407,7 +1393,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:628 +#: code:addons/web/static/src/xml/base.xml:607 #, python-format msgid "No data available for this pivot table. Try to add some records, or make sure\n" " that there is at least one measure and no active filter in the search bar." @@ -1422,14 +1408,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:627 +#: code:addons/web/static/src/xml/base.xml:606 #, python-format msgid "No data to display." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:342 +#: code:addons/web/static/src/js/widgets/debug_manager.js:328 #, python-format msgid "No metadata available" msgstr "" @@ -1478,7 +1464,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:765 +#: code:addons/web/static/src/xml/base.xml:744 #, python-format msgid "Not shown in kanban" msgstr "" @@ -1511,9 +1497,14 @@ msgstr "" msgid "Odoo Enterprise" msgstr "" +#. module: web +#: model:ir.ui.view,arch_db:web.qunit_suite +msgid "Odoo Web Tests" +msgstr "" + #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:653 +#: code:addons/web/static/src/js/views/form_widgets.js:648 #, python-format msgid "Off" msgstr "" @@ -1523,7 +1514,7 @@ msgstr "" #: code:addons/web/static/src/js/framework/dialog.js:41 #: code:addons/web/static/src/js/framework/dialog.js:159 #: code:addons/web/static/src/js/framework/dialog.js:177 -#: code:addons/web/static/src/xml/base.xml:1160 +#: code:addons/web/static/src/xml/base.xml:1138 #, python-format msgid "Ok" msgstr "" @@ -1537,7 +1528,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:651 +#: code:addons/web/static/src/js/views/form_widgets.js:646 #, python-format msgid "On" msgstr "" @@ -1558,7 +1549,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:493 +#: code:addons/web/static/src/xml/base.xml:472 #, python-format msgid "Only you" msgstr "" @@ -1594,14 +1585,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:132 -#, python-format -msgid "Path" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:569 +#: code:addons/web/static/src/xml/base.xml:548 #, python-format msgid "Pie Chart" msgstr "" @@ -1636,28 +1620,28 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1148 +#: code:addons/web/static/src/xml/base.xml:1126 #, python-format msgid "Please note that only the selected ids will be exported." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1147 +#: code:addons/web/static/src/xml/base.xml:1125 #, python-format msgid "Please pay attention that all records matching your search filter will be exported. Not only the selected ids." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:420 +#: code:addons/web/static/src/js/widgets/data_export.js:429 #, python-format msgid "Please select fields to export..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:406 +#: code:addons/web/static/src/js/widgets/data_export.js:415 #, python-format msgid "Please select fields to save export list..." msgstr "" @@ -1674,7 +1658,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1293 +#: code:addons/web/static/src/xml/base.xml:1271 #, python-format msgid "Preferences" msgstr "" @@ -1688,21 +1672,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:175 +#: code:addons/web/static/src/xml/base.xml:154 #, python-format msgid "Print Workflow" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:645 -#, python-format -msgid "Production Environment" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:614 +#: code:addons/web/static/src/xml/base.xml:593 #, python-format msgid "Quarter" msgstr "" @@ -1716,14 +1693,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1130 +#: code:addons/web/static/src/xml/base.xml:1108 #, python-format msgid "Remove" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1131 +#: code:addons/web/static/src/xml/base.xml:1109 #, python-format msgid "Remove All" msgstr "" @@ -1745,9 +1722,9 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:874 -#: code:addons/web/static/src/xml/base.xml:365 -#: code:addons/web/static/src/xml/base.xml:442 -#: code:addons/web/static/src/xml/base.xml:1098 +#: code:addons/web/static/src/xml/base.xml:344 +#: code:addons/web/static/src/xml/base.xml:421 +#: code:addons/web/static/src/xml/base.xml:1076 #, python-format msgid "Save" msgstr "" @@ -1761,22 +1738,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1134 -#: code:addons/web/static/src/xml/base.xml:863 +#: code:addons/web/static/src/js/views/form_widgets.js:1128 #, python-format msgid "Save As..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1160 +#: code:addons/web/static/src/xml/base.xml:1138 #, python-format msgid "Save as:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1086 +#: code:addons/web/static/src/xml/base.xml:1064 #, python-format msgid "Save current search" msgstr "" @@ -1790,14 +1766,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1137 +#: code:addons/web/static/src/xml/base.xml:1115 #, python-format msgid "Save fields list" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1163 +#: code:addons/web/static/src/xml/base.xml:1141 #, python-format msgid "Saved exports:" msgstr "" @@ -1827,7 +1803,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:932 +#: code:addons/web/static/src/xml/base.xml:910 #, python-format msgid "Search..." msgstr "" @@ -1849,8 +1825,8 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:1054 -#: code:addons/web/static/src/xml/base.xml:861 -#: code:addons/web/static/src/xml/base.xml:862 +#: code:addons/web/static/src/xml/base.xml:840 +#: code:addons/web/static/src/xml/base.xml:841 #, python-format msgid "Select" msgstr "" @@ -1862,7 +1838,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:179 +#: code:addons/web/static/src/js/widgets/debug_manager.js:165 #, python-format msgid "Select a view" msgstr "" @@ -1911,7 +1887,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:172 +#: code:addons/web/static/src/xml/base.xml:151 #, python-format msgid "Set Defaults" msgstr "" @@ -1925,7 +1901,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1095 +#: code:addons/web/static/src/xml/base.xml:1073 #, python-format msgid "Share with all users" msgstr "" @@ -1945,7 +1921,7 @@ msgid "Size:" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:1031 +#: code:addons/web/controllers/main.py:1038 #, python-format msgid "Something horrible happened" msgstr "" @@ -1957,13 +1933,6 @@ msgstr "" msgid "Special:" msgstr "" -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:116 -#, python-format -msgid "Start tour" -msgstr "" - #. module: web #. openerp-web #: code:addons/web/static/src/js/framework/misc.js:14 @@ -1980,39 +1949,25 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1291 +#: code:addons/web/static/src/xml/base.xml:1269 #, python-format msgid "Support" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:652 +#: code:addons/web/static/src/js/views/form_widgets.js:647 #, python-format msgid "Switch Off" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:654 +#: code:addons/web/static/src/js/views/form_widgets.js:649 #, python-format msgid "Switch On" msgstr "" -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:648 -#, python-format -msgid "Switch to production environment" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:646 -#, python-format -msgid "Switch to test environment" -msgstr "" - #. module: web #. openerp-web #: code:addons/web/static/src/js/framework/misc.js:18 @@ -2022,18 +1977,11 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:153 +#: code:addons/web/static/src/xml/base.xml:132 #, python-format msgid "Technical Translation" msgstr "" -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:647 -#, python-format -msgid "Test Environment" -msgstr "" - #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_widgets.js:426 @@ -2043,7 +1991,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1134 +#: code:addons/web/static/src/js/views/form_widgets.js:1128 #, python-format msgid "The field is empty, there's nothing to save !" msgstr "" @@ -2063,7 +2011,7 @@ msgid "The line has been modified, your changes will be discarded. Are you sure msgstr "" #. module: web -#: code:addons/web/controllers/main.py:721 +#: code:addons/web/controllers/main.py:718 #, python-format msgid "The new password and its confirmation must be identical." msgstr "" @@ -2076,7 +2024,7 @@ msgid "The o2m record must be saved before an action can be used" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:727 +#: code:addons/web/controllers/main.py:723 #, python-format msgid "The old password you provided is incorrect, your password was not changed." msgstr "" @@ -2097,7 +2045,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1096 +#: code:addons/web/static/src/js/views/form_widgets.js:1090 #, python-format msgid "The selected file exceed the maximum file size of %s." msgstr "" @@ -2111,7 +2059,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1117 +#: code:addons/web/static/src/js/views/form_widgets.js:1111 #, python-format msgid "There was a problem while uploading your file" msgstr "" @@ -2125,7 +2073,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1104 +#: code:addons/web/static/src/xml/base.xml:1082 #, python-format msgid "This wizard will export all data that matches the current search criteria to a CSV file.\n" " You can export all data or only the fields that can be reimported after modification." @@ -2133,14 +2081,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:866 +#: code:addons/web/static/src/js/views/form_widgets.js:861 #, python-format msgid "Timezone Mismatch : The timezone of your browser doesn't match the selected one. The time in Odoo is displayed according to your field timezone." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:119 +#: code:addons/web/static/src/xml/base.xml:118 #, python-format msgid "Toggle Timelines" msgstr "" @@ -2200,22 +2148,16 @@ msgstr "" msgid "Undefined" msgstr "" -#. module: web -#: code:addons/web/controllers/main.py:848 -#, python-format -msgid "Underscore prefixed methods cannot be remotely called" -msgstr "" - #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:635 +#: code:addons/web/static/src/xml/base.xml:614 #, python-format msgid "Unhandled widget" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:805 +#: code:addons/web/static/src/js/views/form_widgets.js:800 #, python-format msgid "Unknown" msgstr "" @@ -2264,7 +2206,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1278 +#: code:addons/web/static/src/xml/base.xml:1256 #, python-format msgid "Update translations" msgstr "" @@ -2278,14 +2220,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1308 +#: code:addons/web/static/src/xml/base.xml:1286 #, python-format msgid "Upgrade to future versions" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:861 +#: code:addons/web/static/src/xml/base.xml:840 #, python-format msgid "Upload your file" msgstr "" @@ -2301,15 +2243,15 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/widgets/sidebar.js:196 -#: code:addons/web/static/src/xml/base.xml:836 -#: code:addons/web/static/src/xml/base.xml:866 +#: code:addons/web/static/src/xml/base.xml:815 +#: code:addons/web/static/src/xml/base.xml:844 #, python-format msgid "Uploading..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1092 +#: code:addons/web/static/src/xml/base.xml:1070 #, python-format msgid "Use by default" msgstr "" @@ -2331,21 +2273,21 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/list_view.js:1926 -#: code:addons/web/static/src/xml/base.xml:180 +#: code:addons/web/static/src/xml/base.xml:159 #, python-format msgid "View" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:150 +#: code:addons/web/static/src/xml/base.xml:129 #, python-format msgid "View Fields" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:174 +#: code:addons/web/static/src/xml/base.xml:153 #, python-format msgid "View Metadata" msgstr "" @@ -2371,7 +2313,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:612 +#: code:addons/web/static/src/xml/base.xml:591 #, python-format msgid "Week" msgstr "" @@ -2391,7 +2333,7 @@ msgid "Widget:" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:477 +#: code:addons/web/controllers/main.py:474 #, python-format msgid "Wrong login/password" msgstr "" @@ -2405,14 +2347,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:192 +#: code:addons/web/static/src/xml/base.xml:171 #, python-format msgid "XML ID:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:615 +#: code:addons/web/static/src/xml/base.xml:594 #, python-format msgid "Year" msgstr "" @@ -2440,14 +2382,14 @@ msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:719 +#: code:addons/web/controllers/main.py:716 #, python-format msgid "You cannot leave any password empty." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1276 +#: code:addons/web/static/src/xml/base.xml:1254 #, python-format msgid "You have updated" msgstr "" @@ -2673,8 +2615,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1027 -#: code:addons/web/static/src/xml/website.tour.xml:14 +#: code:addons/web/static/src/xml/base.xml:1005 #, python-format msgid "or" msgstr "" diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot index ed4ce270a42..977569637ec 100644 --- a/addons/web_editor/i18n/web_editor.pot +++ b/addons/web_editor/i18n/web_editor.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:872 +#: code:addons/web_editor/static/src/js/rte.summernote.js:894 #, python-format msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)" msgstr "" @@ -29,6 +29,36 @@ msgstr "" msgid "(Youtube, Vimeo, Dailymotion)" msgstr "" +#. module: web_editor +#: model:ir.ui.view,arch_db:web_editor.colorpicker +msgid "25% Black" +msgstr "" + +#. module: web_editor +#: model:ir.ui.view,arch_db:web_editor.colorpicker +msgid "25% White" +msgstr "" + +#. module: web_editor +#: model:ir.ui.view,arch_db:web_editor.colorpicker +msgid "50% Black" +msgstr "" + +#. module: web_editor +#: model:ir.ui.view,arch_db:web_editor.colorpicker +msgid "50% White" +msgstr "" + +#. module: web_editor +#: model:ir.ui.view,arch_db:web_editor.colorpicker +msgid "75% Black" +msgstr "" + +#. module: web_editor +#: model:ir.ui.view,arch_db:web_editor.colorpicker +msgid "75% White" +msgstr "" + #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.snippets msgid " First Panel" @@ -36,7 +66,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:924 +#: code:addons/web_editor/static/src/js/rte.summernote.js:946 #, python-format msgid "Action" msgstr "" @@ -62,21 +92,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:906 +#: code:addons/web_editor/static/src/js/rte.summernote.js:928 #, python-format msgid "Align center" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:905 +#: code:addons/web_editor/static/src/js/rte.summernote.js:927 #, python-format msgid "Align left" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:907 +#: code:addons/web_editor/static/src/js/rte.summernote.js:929 #, python-format msgid "Align right" msgstr "" @@ -121,7 +151,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:913 +#: code:addons/web_editor/static/src/js/rte.summernote.js:935 #: code:addons/web_editor/static/src/xml/snippets.xml:49 #, python-format msgid "Background Color" @@ -129,9 +159,9 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/snippets.options.js:405 +#: code:addons/web_editor/static/src/js/snippets.options.js:406 #, python-format -msgid "Background Image Options" +msgid "Background Image Sizing" msgstr "" #. module: web_editor @@ -202,7 +232,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:833 +#: code:addons/web_editor/static/src/js/rte.summernote.js:855 #, python-format msgid "Bold" msgstr "" @@ -223,22 +253,23 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:922 +#: code:addons/web_editor/static/src/js/rte.summernote.js:944 #: code:addons/web_editor/static/src/js/translator.js:74 +#: code:addons/web_editor/static/src/xml/ace.xml:15 #, python-format msgid "Close" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:884 +#: code:addons/web_editor/static/src/js/rte.summernote.js:906 #, python-format msgid "Code" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:899 +#: code:addons/web_editor/static/src/js/rte.summernote.js:921 #, python-format msgid "Code View" msgstr "" @@ -312,7 +343,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/summernote.js:1922 +#: code:addons/web_editor/static/src/js/summernote.js:1920 #: code:addons/web_editor/static/src/xml/editor.xml:298 #, python-format msgid "Default" @@ -340,7 +371,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/snippets.options.js:409 +#: code:addons/web_editor/static/src/js/snippets.options.js:410 #: code:addons/web_editor/static/src/js/widgets.js:26 #: code:addons/web_editor/static/src/xml/editor.xml:12 #: code:addons/web_editor/static/src/xml/editor.xml:140 @@ -362,21 +393,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:926 +#: code:addons/web_editor/static/src/js/rte.summernote.js:948 #, python-format msgid "Document Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:740 +#: code:addons/web_editor/static/src/js/rte.summernote.js:830 #, python-format msgid "Double-click to edit" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:853 +#: code:addons/web_editor/static/src/js/rte.summernote.js:875 #, python-format msgid "Drag an image here" msgstr "" @@ -398,7 +429,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/rte.summernote.js:159 -#: code:addons/web_editor/static/src/js/rte.summernote.js:862 +#: code:addons/web_editor/static/src/js/rte.summernote.js:884 #, python-format msgid "Edit" msgstr "" @@ -445,49 +476,56 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:850 +#: code:addons/web_editor/static/src/js/rte.summernote.js:872 #, python-format msgid "Float Left" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:852 +#: code:addons/web_editor/static/src/js/rte.summernote.js:874 #, python-format msgid "Float None" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:851 +#: code:addons/web_editor/static/src/js/rte.summernote.js:873 #, python-format msgid "Float Right" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:914 +#: code:addons/web_editor/static/src/js/rte.summernote.js:936 #, python-format msgid "Font Color" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:841 +#: code:addons/web_editor/static/src/js/rte.summernote.js:863 #, python-format msgid "Font Family" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:842 +#: code:addons/web_editor/static/src/js/rte.summernote.js:864 #, python-format msgid "Font Size" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:898 +#: code:addons/web_editor/static/src/xml/ace.xml:14 +#, python-format +msgid "Format" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/rte.summernote.js:920 #, python-format msgid "Full Screen" msgstr "" @@ -529,49 +567,49 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:885 +#: code:addons/web_editor/static/src/js/rte.summernote.js:907 #, python-format msgid "Header 1" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:886 +#: code:addons/web_editor/static/src/js/rte.summernote.js:908 #, python-format msgid "Header 2" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:887 +#: code:addons/web_editor/static/src/js/rte.summernote.js:909 #, python-format msgid "Header 3" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:888 +#: code:addons/web_editor/static/src/js/rte.summernote.js:910 #, python-format msgid "Header 4" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:889 +#: code:addons/web_editor/static/src/js/rte.summernote.js:911 #, python-format msgid "Header 5" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:890 +#: code:addons/web_editor/static/src/js/rte.summernote.js:912 #, python-format msgid "Header 6" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:897 +#: code:addons/web_editor/static/src/js/rte.summernote.js:919 #, python-format msgid "Help" msgstr "" @@ -604,14 +642,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:855 +#: code:addons/web_editor/static/src/js/rte.summernote.js:877 #, python-format msgid "Image URL" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:904 +#: code:addons/web_editor/static/src/xml/ace.xml:11 +#, python-format +msgid "Include Asset Bundles" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/rte.summernote.js:926 #, python-format msgid "Indent" msgstr "" @@ -626,49 +671,49 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:878 +#: code:addons/web_editor/static/src/js/rte.summernote.js:900 #, python-format msgid "Insert Horizontal Rule" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:846 +#: code:addons/web_editor/static/src/js/rte.summernote.js:868 #, python-format msgid "Insert Image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:860 +#: code:addons/web_editor/static/src/js/rte.summernote.js:882 #, python-format msgid "Insert Link" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:870 +#: code:addons/web_editor/static/src/js/rte.summernote.js:892 #, python-format msgid "Insert Video" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:834 +#: code:addons/web_editor/static/src/js/rte.summernote.js:856 #, python-format msgid "Italic" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:908 +#: code:addons/web_editor/static/src/js/rte.summernote.js:930 #, python-format msgid "Justify full" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:921 +#: code:addons/web_editor/static/src/js/rte.summernote.js:943 #, python-format msgid "Keyboard shortcuts" msgstr "" @@ -698,14 +743,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:840 +#: code:addons/web_editor/static/src/js/rte.summernote.js:862 #, python-format msgid "Line Height" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:859 +#: code:addons/web_editor/static/src/js/rte.summernote.js:881 #: code:addons/web_editor/static/src/xml/editor.xml:254 #, python-format msgid "Link" @@ -720,7 +765,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/widgets.js:949 +#: code:addons/web_editor/static/src/js/widgets.js:955 #, python-format msgid "Link to" msgstr "" @@ -734,7 +779,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:912 +#: code:addons/web_editor/static/src/js/rte.summernote.js:934 #, python-format msgid "More Color" msgstr "" @@ -768,21 +813,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:882 +#: code:addons/web_editor/static/src/js/rte.summernote.js:904 #, python-format msgid "Normal" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/snippets.options.js:408 +#: code:addons/web_editor/static/src/js/snippets.options.js:409 #, python-format msgid "Ok" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:865 +#: code:addons/web_editor/static/src/js/rte.summernote.js:887 #: code:addons/web_editor/static/src/xml/editor.xml:235 #, python-format msgid "Open in new window" @@ -790,14 +835,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:894 +#: code:addons/web_editor/static/src/js/rte.summernote.js:916 #, python-format msgid "Ordered list" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:903 +#: code:addons/web_editor/static/src/js/rte.summernote.js:925 #, python-format msgid "Outdent" msgstr "" @@ -811,14 +856,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:902 +#: code:addons/web_editor/static/src/js/rte.summernote.js:924 #, python-format msgid "Paragraph" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:925 +#: code:addons/web_editor/static/src/js/rte.summernote.js:947 #, python-format msgid "Paragraph formatting" msgstr "" @@ -832,7 +877,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:845 +#: code:addons/web_editor/static/src/js/rte.summernote.js:867 #, python-format msgid "Picture" msgstr "" @@ -856,28 +901,28 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:883 +#: code:addons/web_editor/static/src/js/rte.summernote.js:905 #, python-format msgid "Quote" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.js:343 +#: code:addons/web_editor/static/src/js/rte.js:336 #, python-format msgid "Readonly field" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:911 +#: code:addons/web_editor/static/src/js/rte.summernote.js:933 #, python-format msgid "Recent Color" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:930 +#: code:addons/web_editor/static/src/js/rte.summernote.js:952 #, python-format msgid "Redo" msgstr "" @@ -898,14 +943,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:839 +#: code:addons/web_editor/static/src/js/rte.summernote.js:861 #, python-format msgid "Remove Font Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:856 +#: code:addons/web_editor/static/src/js/rte.summernote.js:878 #, python-format msgid "Remove Image" msgstr "" @@ -940,7 +985,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:917 +#: code:addons/web_editor/static/src/js/rte.summernote.js:939 #, python-format msgid "Reset" msgstr "" @@ -954,28 +999,28 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:918 +#: code:addons/web_editor/static/src/js/rte.summernote.js:940 #, python-format msgid "Reset to default" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:847 +#: code:addons/web_editor/static/src/js/rte.summernote.js:869 #, python-format msgid "Resize Full" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:848 +#: code:addons/web_editor/static/src/js/rte.summernote.js:870 #, python-format msgid "Resize Half" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:849 +#: code:addons/web_editor/static/src/js/rte.summernote.js:871 #, python-format msgid "Resize Quarter" msgstr "" @@ -990,6 +1035,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets.js:25 +#: code:addons/web_editor/static/src/xml/ace.xml:13 #: code:addons/web_editor/static/src/xml/editor.xml:13 #, python-format msgid "Save" @@ -1013,7 +1059,7 @@ msgstr "" #. openerp-web #: code:addons/web_editor/static/src/xml/snippets.xml:30 #, python-format -msgid "Select Container Block" +msgid "Select Parent Container" msgstr "" #. module: web_editor @@ -1032,7 +1078,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:854 +#: code:addons/web_editor/static/src/js/rte.summernote.js:876 #, python-format msgid "Select from files" msgstr "" @@ -1053,7 +1099,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:916 +#: code:addons/web_editor/static/src/js/rte.summernote.js:938 #, python-format msgid "Set transparent" msgstr "" @@ -1096,14 +1142,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:836 +#: code:addons/web_editor/static/src/js/rte.summernote.js:858 #, python-format msgid "Strikethrough" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:881 +#: code:addons/web_editor/static/src/js/rte.summernote.js:903 #: code:addons/web_editor/static/src/xml/editor.xml:246 #, python-format msgid "Style" @@ -1111,7 +1157,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:837 +#: code:addons/web_editor/static/src/js/rte.summernote.js:859 #, python-format msgid "Subscript" msgstr "" @@ -1126,28 +1172,35 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:838 +#: code:addons/web_editor/static/src/js/rte.summernote.js:860 #, python-format msgid "Superscript" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:875 +#: code:addons/web_editor/static/src/js/rte.summernote.js:897 #, python-format msgid "Table" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:923 +#: code:addons/web_editor/static/src/js/ace.js:210 +#, python-format +msgid "Template ID: %s" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/rte.summernote.js:945 #, python-format msgid "Text formatting" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:863 +#: code:addons/web_editor/static/src/js/rte.summernote.js:885 #, python-format msgid "Text to display" msgstr "" @@ -1177,7 +1230,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:864 +#: code:addons/web_editor/static/src/js/rte.summernote.js:886 #, python-format msgid "To what URL should this link go?" msgstr "" @@ -1198,7 +1251,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:915 +#: code:addons/web_editor/static/src/js/rte.summernote.js:937 #, python-format msgid "Transparent" msgstr "" @@ -1212,28 +1265,28 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:835 +#: code:addons/web_editor/static/src/js/rte.summernote.js:857 #, python-format msgid "Underline" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:929 +#: code:addons/web_editor/static/src/js/rte.summernote.js:951 #, python-format msgid "Undo" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:861 +#: code:addons/web_editor/static/src/js/rte.summernote.js:883 #, python-format msgid "Unlink" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:893 +#: code:addons/web_editor/static/src/js/rte.summernote.js:915 #, python-format msgid "Unordered list" msgstr "" @@ -1268,7 +1321,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:868 +#: code:addons/web_editor/static/src/js/rte.summernote.js:890 #: code:addons/web_editor/static/src/xml/editor.xml:53 #, python-format msgid "Video" @@ -1276,14 +1329,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:869 +#: code:addons/web_editor/static/src/js/rte.summernote.js:891 #, python-format msgid "Video Link" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:871 +#: code:addons/web_editor/static/src/js/rte.summernote.js:893 #, python-format msgid "Video URL?" msgstr "" @@ -1361,11 +1414,6 @@ msgstr "" msgid "ir.qweb.field" msgstr "" -#. module: web_editor -#: model:ir.model,name:web_editor.model_ir_qweb_field_barcode -msgid "ir.qweb.field.barcode" -msgstr "" - #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_contact msgid "ir.qweb.field.contact" diff --git a/addons/web_tour/i18n/web_tour.pot b/addons/web_tour/i18n/web_tour.pot index 22b7469367b..9d5a668802b 100644 --- a/addons/web_tour/i18n/web_tour.pot +++ b/addons/web_tour/i18n/web_tour.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0alpha1e\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 08:38+0000\n" -"PO-Revision-Date: 2016-08-18 08:38+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,14 +17,14 @@ msgstr "" #. module: web_tour #. openerp-web -#: code:addons/web_tour/static/src/js/tour_manager.js:360 +#: code:addons/web_tour/static/src/js/tour_manager.js:469 #, python-format msgid "Click the Home icon to navigate across apps." msgstr "" #. module: web_tour #. openerp-web -#: code:addons/web_tour/static/src/xml/debug_manager.xml:7 +#: code:addons/web_tour/static/src/xml/debug_manager.xml:8 #, python-format msgid "Consume Tours" msgstr "" @@ -66,11 +66,32 @@ msgstr "" #. module: web_tour #. openerp-web -#: code:addons/web_tour/static/src/js/tour_manager.js:129 +#: code:addons/web_tour/static/src/xml/debug_manager.xml:21 +#, python-format +msgid "Name" +msgstr "" + +#. module: web_tour +#. openerp-web +#: code:addons/web_tour/static/src/xml/debug_manager.xml:22 +#, python-format +msgid "Path" +msgstr "" + +#. module: web_tour +#. openerp-web +#: code:addons/web_tour/static/src/js/tour_manager.js:228 #, python-format msgid "Skip tour" msgstr "" +#. module: web_tour +#. openerp-web +#: code:addons/web_tour/static/src/xml/debug_manager.xml:11 +#, python-format +msgid "Start tour" +msgstr "" + #. module: web_tour #: model:ir.ui.view,arch_db:web_tour.edit_tour_search msgid "Tip" diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot index d3437099958..e906fc0501a 100644 --- a/addons/website/i18n/website.pot +++ b/addons/website/i18n/website.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -184,6 +184,20 @@ msgid "Great stories have personality. Consider telling\n" " of view, not from someone else's experience." msgstr "" +#. module: website +#. openerp-web +#: code:addons/website/static/src/js/website.tour.banner.js:72 +#, python-format +msgid "Install a contact form to improve this page." +msgstr "" + +#. module: website +#. openerp-web +#: code:addons/website/static/src/js/website.tour.banner.js:77 +#, python-format +msgid "Install new apps to get more features. Let's install the 'Contact form' app." +msgstr "" + #. module: website #: model:ir.actions.act_window,help:website.action_module_theme msgid "No theme module found!" @@ -205,24 +219,28 @@ msgid "Sign in" msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.s_button -msgid "\n" -" Contact Us Now" +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Background Image Sizing" msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.snippet_options -msgid "Style" +msgid "Images spacing" +msgstr "" + +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Scroll Speed" +msgstr "" + +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Slideshow speed" msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.snippets -msgid " Feature" -msgstr "" - -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Background Image Options" +msgid " Feature" msgstr "" #. module: website @@ -230,6 +248,11 @@ msgstr "" msgid " Email Our Website Expert" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Margin" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Background Color" @@ -237,7 +260,7 @@ msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.snippets -msgid " Content" +msgid " Inner content" msgstr "" #. module: website @@ -245,6 +268,21 @@ msgstr "" msgid " Effect" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Mode" +msgstr "" + +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Float" +msgstr "" + +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Styling" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Background Image" @@ -261,6 +299,21 @@ msgstr "" msgid "Add Slide" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Add images" +msgstr "" + +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Re-order" +msgstr "" + +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Columns" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.snippets msgid " Structure" @@ -271,11 +324,21 @@ msgstr "" msgid " WEBSITE " msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Remove all images" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Remove Slide" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Remove from gallery" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "\n" @@ -325,14 +388,11 @@ msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.s_parallax_slider -#: model:ir.ui.view,arch_db:website.s_quote -#: model:ir.ui.view,arch_db:website.s_references msgid "Author of this quote" msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.s_parallax_slider -#: model:ir.ui.view,arch_db:website.s_references msgid "John Doe, CEO" msgstr "" @@ -404,6 +464,14 @@ msgstr "" msgid " 1. Choose your theme" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.layout +msgid "Toggle navigation\n" +" \n" +" \n" +" " +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.s_comparisons msgid "$125.00" @@ -774,15 +842,11 @@ msgid "A small explanation of this great
feature, in clear words." msgstr "" #. module: website +#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_version #: model:ir.ui.view,arch_db:website.website_planner msgid "A/B Testing" msgstr "" -#. module: website -#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_version -msgid "A/B testing and versioning" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "A/B testing is the process of testing two versions of a page to see which one performs\n" @@ -795,7 +859,7 @@ msgid "A/B testing is the process of testing two versions of a page to see which msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website +#: model:ir.ui.view,arch_db:website.view_website_config_settings msgid "API Key" msgstr "" @@ -852,7 +916,6 @@ msgstr "" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.gallery.xml:18 -#: model:ir.ui.view,arch_db:website.snippet_options #, python-format msgid "Add images" msgstr "" @@ -898,6 +961,11 @@ msgstr "" msgid "All these icons are licensed under creative commons so that you can use them." msgstr "" +#. module: website +#: selection:website.config.settings,module_website_version:0 +msgid "Allow multiple versions of the same page (advanced)" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Allows your customers and the whole community to ask and answer questions about their interests." @@ -939,11 +1007,6 @@ msgstr "" msgid "Apply" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Aqua" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "As you add more pages to your website, your main menu will begin to feel overcrowded.\n" @@ -975,11 +1038,6 @@ msgstr "" msgid "Avoid special characters" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Baby Blue" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.500 msgid "Back" @@ -1031,16 +1089,6 @@ msgstr "" msgid "Big" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Bigger Text" -msgstr "" - -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Black" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Boost your online sales with sleek product pages." @@ -1058,7 +1106,7 @@ msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.snippet_options -msgid "Business Guy" +msgid "Building Profile" msgstr "" #. module: website @@ -1131,6 +1179,11 @@ msgstr "" msgid "Circle" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "City" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Click on 'Translate' on the menu bar" @@ -1148,28 +1201,17 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.ace.xml:14 #: code:addons/website/static/src/xml/website.gallery.xml:97 #: code:addons/website/static/src/xml/website.translator.xml:13 #, python-format msgid "Close" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Color Splash" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Colors palette" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Columns" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Communicate" @@ -1253,6 +1295,12 @@ msgstr "" msgid "Contact Us" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.s_button +msgid "Contact Us Now\n" +" " +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Contact a Domain Manager in your country to buy it" @@ -1319,9 +1367,14 @@ msgstr "" msgid "Create a new project (this may take some time)" msgstr "" +#. module: website +#: selection:website.config.settings,module_website_form_editor:0 +msgid "Create and customize forms to generate emails, leads, issues and extra information in the checkout process (new snippet available)" +msgstr "" + #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.editor.js:141 +#: code:addons/website/static/src/js/website.editor.js:138 #, python-format msgid "Create page '%s'" msgstr "" @@ -1348,6 +1401,11 @@ msgid "Creating your main menu is an important and difficult stage in building y " In fact, you need to build your navigation menu for your visitors and not for your own purposes or objectives." msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Cubes" +msgstr "" + #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.backend.xml:28 @@ -1380,7 +1438,7 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_config_settings_default_lang_id #: model:ir.model.fields,field_description:website.field_website_default_lang_id -msgid "Default language" +msgid "Default Language" msgstr "" #. module: website @@ -1409,6 +1467,11 @@ msgid "Delete the above image or replace it with a picture\n" " change it's rounded corner style." msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.s_references +msgid "Demo Logo" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.s_faq_collapse msgid "Deploy new stores with just an internet connection: no\n" @@ -1503,6 +1566,11 @@ msgstr "" msgid "Download the technical documentation of a product" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Downtown" +msgstr "" + #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.contentMenu.xml:42 @@ -1581,6 +1649,16 @@ msgstr "" msgid "Edit the menu" msgstr "" +#. module: website +#: model:res.groups,name:website.group_website_publisher +msgid "Editor" +msgstr "" + +#. module: website +#: model:res.groups,name:website.group_website_designer +msgid "Editor and Designer" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.s_comparisons msgid "Email support" @@ -1641,11 +1719,6 @@ msgid "Explain to them why you launched your new website and ask them for their\ " ready for the big launch." msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.view_website_config_settings -msgid "Extra Features" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Extra-Large" @@ -1718,18 +1791,13 @@ msgstr "" msgid "Float" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Flowers Field" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Folded list" msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website +#: model:ir.ui.view,arch_db:website.view_website_config_settings msgid "Follow" msgstr "" @@ -1767,14 +1835,7 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_form_editor -msgid "Form builde = create and customize forms" -msgstr "" - -#. module: website -#. openerp-web -#: code:addons/website/static/src/xml/website.ace.xml:13 -#, python-format -msgid "Format" +msgid "Form Builder" msgstr "" #. module: website @@ -1814,11 +1875,6 @@ msgstr "" msgid "Get this page efficiently referenced in Google to attract more visitors." msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Girl" -msgstr "" - #. module: website #: model:ir.model.fields,field_description:website.field_website_config_settings_social_github #: model:ir.model.fields,field_description:website.field_website_social_github @@ -1875,12 +1931,13 @@ msgid "Google Business" msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website +#: model:ir.ui.view,arch_db:website.company_description +#: model:ir.ui.view,arch_db:website.view_website_config_settings msgid "Google Maps" msgstr "" #. module: website -#: model:ir.model.fields,field_description:website.field_base_config_settings_google_maps_api_key +#: model:ir.model.fields,field_description:website.field_website_config_settings_google_maps_api_key msgid "Google Maps API Key" msgstr "" @@ -1905,11 +1962,6 @@ msgstr "" msgid "Great products for great people" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Greenfields" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Grid" @@ -1925,11 +1977,6 @@ msgstr "" msgid "Grow" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.user_navbar -msgid "HELP & TUTORIALS" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.user_navbar msgid "HTML Editor" @@ -1950,11 +1997,6 @@ msgstr "" msgid "Headline or product description," msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.user_navbar -msgid "Help" -msgstr "" - #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.translator.xml:21 @@ -1994,7 +2036,7 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_config_settings_id #: model:ir.model.fields,field_description:website.field_website_id -#: model:ir.model.fields,field_description:website.field_website_menu_id_1971 +#: model:ir.model.fields,field_description:website.field_website_menu_id_1922 #: model:ir.model.fields,field_description:website.field_website_published_mixin_id #: model:ir.model.fields,field_description:website.field_website_seo_metadata_id msgid "ID" @@ -2022,11 +2064,6 @@ msgstr "" msgid "Images on landing and product pages," msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Images spacing" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Improve your conversion from visitor to customer." @@ -2053,13 +2090,6 @@ msgid "In this mode, you can only translate texts. To\n" " versions." msgstr "" -#. module: website -#. openerp-web -#: code:addons/website/static/src/xml/website.ace.xml:10 -#, python-format -msgid "Include Asset Bundles" -msgstr "" - #. module: website #. openerp-web #: code:addons/website/static/src/js/website.backendDashboard.js:95 @@ -2150,11 +2180,6 @@ msgstr "" msgid "Join us and make your company a better place." msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Landscape" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.view_website_config_settings msgid "Language" @@ -2260,8 +2285,8 @@ msgid "Loading..." msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.s_references -msgid "Logo" +#: model:ir.ui.view,arch_db:website.layout +msgid "Logout" msgstr "" #. module: website @@ -2269,16 +2294,6 @@ msgstr "" msgid "Main Menu" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Mango" -msgstr "" - -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Margin" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Masonry" @@ -2315,11 +2330,6 @@ msgstr "" msgid "Mobile preview" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Mode" -msgstr "" - #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.backend.xml:50 @@ -2337,11 +2347,6 @@ msgstr "" msgid "More info on pricing:" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.s_references -msgid "More than 500 happy customers." -msgstr "" - #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:41 @@ -2349,11 +2354,6 @@ msgstr "" msgid "Most searched topics related to your keywords, ordered by importance:" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Mountains" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Move to first" @@ -2375,8 +2375,8 @@ msgid "Move to previous" msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Narrow" +#: model:ir.ui.view,arch_db:website.layout +msgid "My Website" msgstr "" #. module: website @@ -2399,7 +2399,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.editor.js:126 +#: code:addons/website/static/src/js/website.editor.js:123 #, python-format msgid "New or existing page" msgstr "" @@ -2420,6 +2420,11 @@ msgstr "" msgid "No support" msgstr "" +#. module: website +#: selection:website.config.settings,module_website_version:0 +msgid "No version management and A/B testing (easy)" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "None" @@ -2481,12 +2486,6 @@ msgid "Odoo provides essential platform for our project management.\n" " Things are better organized and more visible with it." msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.s_references -msgid "Odoo provides essential platform for our project management.\n" -" Things are better organized and more visible with it." -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.s_text_image msgid "Odoo text and image block" @@ -2534,7 +2533,7 @@ msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.layout_footer_copyright -msgid "Open Source eCommerce" +msgid "Open Source e-Commerce" msgstr "" #. module: website @@ -2542,11 +2541,6 @@ msgstr "" msgid "Optimize SEO" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Orange Red" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.s_comparisons msgid "Order now" @@ -2615,6 +2609,11 @@ msgstr "" msgid "Page Title" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Panama Sky" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.s_panel msgid "Panels are a great tool to compare offers or to emphasize on\n" @@ -2646,6 +2645,16 @@ msgstr "" msgid "Partner-related data of the user" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Peak" +msgstr "" + +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "People" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.view_website_config_settings msgid "Performance Optimization" @@ -2769,26 +2778,11 @@ msgstr "" msgid "Published" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Purple" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.http_error_debug msgid "QWeb" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Quote" -msgstr "" - -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Re-order" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Ready For Launch!" @@ -2804,16 +2798,6 @@ msgstr "" msgid "Reduce the time and resources spent on support." msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Remove all images" -msgstr "" - -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Remove from gallery" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.user_navbar msgid "Rename Page" @@ -2858,6 +2842,11 @@ msgstr "" msgid "SEO metadata" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Sails" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.s_feature_grid msgid "Sample images" @@ -2867,16 +2856,10 @@ msgstr "" #. openerp-web #: code:addons/website/static/src/js/website.backendDashboard.js:76 #: code:addons/website/static/src/js/website.seo.js:363 -#: code:addons/website/static/src/xml/website.ace.xml:12 #, python-format msgid "Save" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Scroll Speed" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.menu_search msgid "Search Menus" @@ -2984,11 +2967,6 @@ msgstr "" msgid "Slideshow" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Slideshow speed" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Slow" @@ -3057,11 +3035,6 @@ msgstr "" msgid "Still in the left-side menu, go to APIs and auth > Credentials and click on 'Create New Client ID'" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Styling" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.footer_custom msgid "Subtitle" @@ -3077,11 +3050,6 @@ msgstr "" msgid "Subtitle 3" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Sunflower" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.user_navbar msgid "TRANSLATE" @@ -3108,13 +3076,6 @@ msgstr "" msgid "Template %s (id:%s) contains a link to this page" msgstr "" -#. module: website -#. openerp-web -#: code:addons/website/static/src/js/website.ace.js:256 -#, python-format -msgid "Template ID: %s" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.500 msgid "Template fallback" @@ -3397,6 +3358,11 @@ msgstr "" msgid "Twitter Account" msgstr "" +#. module: website +#: model:ir.ui.view,arch_db:website.snippet_options +msgid "Type" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.500 msgid "Type 'yes' in the box below if you want to confirm." @@ -3477,6 +3443,11 @@ msgstr "" msgid "Use a free, automatic machine translation (quality will vary depending on languages)" msgstr "" +#. module: website +#: selection:website.config.settings,module_website_form_editor:0 +msgid "Use standard forms" +msgstr "" + #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Use the Customize menu to change the look of your theme:" @@ -3500,11 +3471,6 @@ msgid "User-agent: *\n" "Sitemap:" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Velour" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Very Fast" @@ -3547,11 +3513,6 @@ msgstr "" msgid "Visits" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.company_description -msgid "Visualize on Google Maps" -msgstr "" - #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.xml:64 @@ -3646,11 +3607,6 @@ msgstr "" msgid "Website Path" msgstr "" -#. module: website -#: model:crm.team,name:website.salesteam_website_sales -msgid "Website Sales" -msgstr "" - #. module: website #: model:ir.actions.act_window,name:website.action_website_configuration #: model:ir.ui.view,arch_db:website.view_website_form @@ -3828,33 +3784,16 @@ msgstr "" msgid "With a great subtitle" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Wood" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.s_parallax_slider msgid "Write a quote here from one of your customers. Quotes are a\n" " great way to build confidence in your products or services." msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.s_references -msgid "Write a quote here from one of your customers. Quotes are a\n" -" great way to build confidence in your products or services." -msgstr "" - -#. module: website -#: model:ir.ui.view,arch_db:website.s_quote -msgid "Write a quote here from one of your customers. Quotes are a\n" -" great way to build confidence in your products or services." -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.s_text_image msgid "Write one or two paragraphs describing your product or\n" -" services. To be successful your content needs to be\n" +" services.
To be successful your content needs to be\n" " useful to your readers." msgstr "" @@ -3887,11 +3826,6 @@ msgstr "" msgid "Year" msgstr "" -#. module: website -#: model:ir.ui.view,arch_db:website.snippet_options -msgid "Yellow Green" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.s_faq_collapse msgid "Yes" @@ -4062,11 +3996,6 @@ msgstr "" msgid "and we'll configure your website and/or email for you." msgstr "" -#. module: website -#: model:ir.model,name:website.model_base_config_settings -msgid "base.config.settings" -msgstr "" - #. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "button." @@ -4278,12 +4207,12 @@ msgid "the classic Odoo interface" msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website +#: model:ir.ui.view,arch_db:website.view_website_config_settings msgid "the instructions" msgstr "" #. module: website -#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website +#: model:ir.ui.view,arch_db:website.view_website_config_settings msgid "to create your key." msgstr "" diff --git a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot index d3223607794..6585d3eab60 100644 --- a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot +++ b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -350,6 +350,11 @@ msgstr "" msgid "Date Review" msgstr "" +#. module: website_crm_partner_assign +#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity +msgid "Deadline:" +msgstr "" + #. module: website_crm_partner_assign #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_delay_open msgid "Delay to Assign" @@ -607,7 +612,7 @@ msgid "Leads Analysis" msgstr "" #. module: website_crm_partner_assign -#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_9884 +#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_9933 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form msgid "Level" msgstr "" @@ -865,6 +870,11 @@ msgstr "" msgid "Priority" msgstr "" +#. module: website_crm_partner_assign +#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity +msgid "Priority:" +msgstr "" + #. module: website_crm_partner_assign #: code:addons/website_crm_partner_assign/controllers/main.py:102 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity diff --git a/addons/website_mail/i18n/website_mail.pot b/addons/website_mail/i18n/website_mail.pot index a1b67b1e47a..a74bc57536c 100644 --- a/addons/website_mail/i18n/website_mail.pot +++ b/addons/website_mail/i18n/website_mail.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgid "\n" "
    \n" "
  • \n" "

    \n" -" From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)\n" +" From the Customize / Install Apps menu, you can install new features (forum, blog, e-Commerce, jobs, ...)\n" "

    \n" "
    • \n" "
  • \n" diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot index da4e68428db..792679f0c3b 100644 --- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot +++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.saas~10c\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 14:08+0000\n" -"PO-Revision-Date: 2016-08-18 14:08+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -49,6 +49,11 @@ msgstr "" msgid "Add a Newsletter Subscribe Popup" msgstr "" +#. module: website_mass_mailing +#: selection:mass.mailing.config.settings,group_website_popup_on_exit:0 +msgid "Allow the use of a pop-up snippet on website to encourage visitors to sign up on a mass mailing list" +msgstr "" + #. module: website_mass_mailing #: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe #: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_options @@ -60,11 +65,21 @@ msgstr "" msgid "Choose your mailing subscriptions." msgstr "" +#. module: website_mass_mailing +#: selection:mass.mailing.config.settings,group_website_popup_on_exit:0 +msgid "Do not add extra content on website pages to encourage visitors to sign up" +msgstr "" + #. module: website_mass_mailing #: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet msgid "Here To Edit Dialog Content" msgstr "" +#. module: website_mass_mailing +#: model:ir.model,name:website_mass_mailing.model_mail_mass_mailing_list +msgid "Mailing List" +msgstr "" + #. module: website_mass_mailing #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed @@ -78,6 +93,11 @@ msgstr "" msgid "Newsletter" msgstr "" +#. module: website_mass_mailing +#: model:ir.ui.view,arch_db:website_mass_mailing.view_mail_mass_mailing_list_form +msgid "Popup Content" +msgstr "" + #. module: website_mass_mailing #: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe #: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet @@ -101,6 +121,26 @@ msgstr "" msgid "Type Here ..." msgstr "" +#. module: website_mass_mailing +#: model:res.groups,name:website_mass_mailing.group_website_popup_on_exit +msgid "Use subscription pop up on the website" +msgstr "" + +#. module: website_mass_mailing +#: model:ir.model.fields,field_description:website_mass_mailing.field_mass_mailing_config_settings_group_website_popup_on_exit +msgid "Website Pop-up" +msgstr "" + +#. module: website_mass_mailing +#: model:ir.model.fields,field_description:website_mass_mailing.field_mail_mass_mailing_list_popup_content +msgid "Website Popup Content" +msgstr "" + +#. module: website_mass_mailing +#: model:ir.model.fields,field_description:website_mass_mailing.field_mail_mass_mailing_list_popup_redirect_url +msgid "Website Popup Redirect URL" +msgstr "" + #. module: website_mass_mailing #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe msgid "You are not subscribed to any of our mailing list." @@ -111,6 +151,11 @@ msgstr "" msgid "Your changes have been saved." msgstr "" +#. module: website_mass_mailing +#: model:ir.model,name:website_mass_mailing.model_mass_mailing_config_settings +msgid "mass.mailing.config.settings" +msgstr "" + #. module: website_mass_mailing #: model:ir.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe #: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet diff --git a/addons/website_portal_sale/i18n/website_portal_sale.pot b/addons/website_portal_sale/i18n/website_portal_sale.pot index 5f73bde81ae..23bfa4d1985 100644 --- a/addons/website_portal_sale/i18n/website_portal_sale.pot +++ b/addons/website_portal_sale/i18n/website_portal_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -116,11 +116,6 @@ msgstr "" msgid "Unit Price" msgstr "" -#. module: website_portal_sale -#: model:ir.ui.view,arch_db:website_portal_sale.sale_backend_link -msgid "Access the complete Sale application" -msgstr "" - #. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices msgid "Amount Due" @@ -143,11 +138,6 @@ msgstr "" msgid "Due Date" msgstr "" -#. module: website_portal_sale -#: model:ir.ui.view,arch_db:website_portal_sale.sales_backend_access -msgid "If you wish to access the complete application to manage your orders, you can follow" -msgstr "" - #. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices msgid "Invoice #" @@ -193,6 +183,11 @@ msgstr "" msgid "Pay Now" msgstr "" +#. module: website_portal_sale +#: model:ir.model,name:website_portal_sale.model_payment_transaction +msgid "Payment Transaction" +msgstr "" + #. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.orders_followup msgid "Quotation" @@ -208,6 +203,11 @@ msgstr "" msgid "Quotes" msgstr "" +#. module: website_portal_sale +#: model:ir.model.fields,field_description:website_portal_sale.field_payment_transaction_sale_order_id +msgid "Sale Order" +msgstr "" + #. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders msgid "Sale Order #" @@ -275,8 +275,3 @@ msgstr "" msgid "Your Quotes" msgstr "" -#. module: website_portal_sale -#: model:ir.ui.view,arch_db:website_portal_sale.sales_backend_access -msgid "this link" -msgstr "" - diff --git a/addons/website_project/i18n/website_project.pot b/addons/website_project/i18n/website_project.pot index 1e2f9ecce0c..cc278ff825d 100644 --- a/addons/website_project/i18n/website_project.pot +++ b/addons/website_project/i18n/website_project.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0alpha1e\n" +"Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-18 08:38+0000\n" -"PO-Revision-Date: 2016-08-18 08:38+0000\n" +"POT-Creation-Date: 2016-09-05 14:11+0000\n" +"PO-Revision-Date: 2016-09-05 14:11+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -108,6 +108,11 @@ msgstr "" msgid "Newest" msgstr "" +#. module: website_project +#: model:ir.model,name:website_project.model_project_project +msgid "Project" +msgstr "" + #. module: website_project #: model:ir.ui.view,arch_db:website_project.my_project msgid "Project -" @@ -131,6 +136,7 @@ msgid "Stage" msgstr "" #. module: website_project +#: model:ir.model,name:website_project.model_project_task #: model:ir.ui.view,arch_db:website_project.my_tasks msgid "Task" msgstr "" diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot index 0cd5163d380..210da019546 100644 --- a/addons/website_quote/i18n/website_quote.pot +++ b/addons/website_quote/i18n/website_quote.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -930,6 +930,11 @@ msgstr "" msgid "Your order ${object.name} is confirmed" msgstr "" +#. module: website_quote +#: model:ir.ui.view,arch_db:website_quote.so_quotation +msgid "Your payment has been authorized." +msgstr "" + #. module: website_quote #: model:ir.ui.view,arch_db:website_quote.so_quotation msgid "Your payment has been received, thank you for your trust." diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot index 87fc71d9107..f1b0fb311f7 100644 --- a/addons/website_sale/i18n/website_sale.pot +++ b/addons/website_sale/i18n/website_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:25+0000\n" -"PO-Revision-Date: 2016-08-26 10:25+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,9 +15,14 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "! Some processing fees will be applied" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.payment -msgid "(extra fees apply)" +msgid "(processing fees apply)" msgstr "" #. module: website_sale @@ -55,6 +60,12 @@ msgid "
    \n" " Payment Status:" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "
    \n" +" Are you sure you want to pay with this card:
    " +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address_kanban msgid " Ship to this address" @@ -117,12 +128,30 @@ msgstr "" msgid "Subtotal:" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment +msgid "\n" +" Saved Cards" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.product msgid "\n" " In Stock" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.product +msgid "\n" +" Previous" +msgstr "" + +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.product +msgid "\n" +" Next" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid " Website Live Chat on" @@ -170,6 +199,11 @@ msgid "Process Checkout\n" " " msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment +msgid "&nbsp;" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "\n" @@ -425,6 +459,11 @@ msgstr "" msgid "A document to provide ?" msgstr "" +#. module: website_sale +#: selection:website.config.settings,sale_pricelist_setting_split_1:0 +msgid "A single sales price per product" +msgstr "" + #. module: website_sale #: model:ir.ui.menu,name:website_sale.menu_orders_abandonned_orders msgid "Abandonned Orders" @@ -432,7 +471,7 @@ msgstr "" #. module: website_sale #: model:ir.actions.act_window,name:website_sale.action_abandonned_orders_ecommerce -msgid "Abandonned eCommerce Orders" +msgid "Abandonned e-Commerce Orders" msgstr "" #. module: website_sale @@ -451,6 +490,11 @@ msgstr "" msgid "Activate the 'Support multiple variants per products' option in" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_portal +msgid "Activate the customer portal" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Activate the payment options you want to use" @@ -471,6 +515,11 @@ msgstr "" msgid "Add to Cart" msgstr "" +#. module: website_sale +#: selection:website.config.settings,sale_pricelist_setting_split_2:0 +msgid "Advanced pricing based on formulas (discounts, margins, rounding)" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.option_collapse_products_categories #: model:ir.ui.view,arch_db:website_sale.products_categories @@ -482,6 +531,12 @@ msgstr "" msgid "Allow the end user to choose this price list" msgstr "" +#. module: website_sale +#: model:ir.model.fields,help:website_sale.field_website_config_settings_group_sale_pricelist +msgid "Allows to manage different prices based on rules per category of customers.\n" +" Example: 10% for retailers, promotion of 5 EUR on this product, etc." +msgstr "" + #. module: website_sale #. openerp-web #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:32 @@ -526,8 +581,7 @@ msgid "Best Sellers" msgstr "" #. module: website_sale -#: model:ir.ui.view,arch_db:website_sale.confirmation -#: model:ir.ui.view,arch_db:website_sale.payment +#: model:ir.ui.view,arch_db:website_sale.bill_to msgid "Bill To:" msgstr "" @@ -632,6 +686,11 @@ msgstr "" msgid "Configure your delivery prices" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "Confirm" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.checkout msgid "Confirm " @@ -684,6 +743,7 @@ msgid "Coupon Code" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_create_uid #: model:ir.model.fields,field_description:website_sale.field_product_public_category_create_uid #: model:ir.model.fields,field_description:website_sale.field_product_style_create_uid #: model:ir.model.fields,field_description:website_sale.field_website_pricelist_create_uid @@ -691,6 +751,7 @@ msgid "Created by" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_create_date #: model:ir.model.fields,field_description:website_sale.field_product_public_category_create_date #: model:ir.model.fields,field_description:website_sale.field_product_style_create_date #: model:ir.model.fields,field_description:website_sale.field_website_pricelist_create_date @@ -737,6 +798,16 @@ msgstr "" msgid "Delivery Strategy" msgstr "" +#. module: website_sale +#: selection:website.config.settings,sale_delivery_settings:0 +msgid "Delivery methods are only used internally: the customer doesn't pay for shipping costs" +msgstr "" + +#. module: website_sale +#: selection:website.config.settings,sale_delivery_settings:0 +msgid "Delivery methods are selectable on the website: the customer pays for shipping costs" +msgstr "" + #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_product_product_quote_description msgid "Description for the quote" @@ -754,6 +825,7 @@ msgid "Determine the display order in the Website E-commerce" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_display_name #: model:ir.model.fields,field_description:website_sale.field_product_public_category_display_name #: model:ir.model.fields,field_description:website_sale.field_product_style_display_name #: model:ir.model.fields,field_description:website_sale.field_website_pricelist_display_name @@ -799,6 +871,11 @@ msgstr "" msgid "Email" msgstr "" +#. module: website_sale +#: model:ir.model.fields,help:website_sale.field_website_config_settings_order_mail_template +msgid "Email sent to customer at the end of the checkout process" +msgstr "" + #. module: website_sale #. openerp-web #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:19 @@ -826,7 +903,7 @@ msgid "Equal : Cost will be equally divided.\n" msgstr "" #. module: website_sale -#: code:addons/website_sale/models/product.py:57 +#: code:addons/website_sale/models/product.py:58 #, python-format msgid "Error ! You cannot create recursive categories." msgstr "" @@ -871,11 +948,26 @@ msgstr "" msgid "Fedex integration" msgstr "" +#. module: website_sale +#: model:ir.model.fields,help:website_sale.field_website_config_settings_sale_pricelist_setting_split_1 +#: model:ir.model.fields,help:website_sale.field_website_config_settings_sale_pricelist_setting_split_2 +msgid "Fix Price: all price manage from products sale price.\n" +"Different prices per Customer: you can assign price on buying of minimum quantity in products sale tab.\n" +"Advanced pricing based on formula: You can have all the rights on pricelist" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Focus on adding content and improving the pages for your best-selling products: don't try to create complete pages for all your products at first!" msgstr "" +#. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:62 +#, python-format +msgid "Follow the steps and advises in the Odoo Planner to deploy your e-Commerce website in no time!" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Free and easy to setup" @@ -896,6 +988,11 @@ msgstr "" msgid "Give us your feedback..." msgstr "" +#. module: website_sale +#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_portal +msgid "Give your customers access to their documents." +msgstr "" + #. module: website_sale #: model:ir.model.fields,help:website_sale.field_product_public_category_sequence msgid "Gives the sequence order when displaying a list of product categories." @@ -947,24 +1044,38 @@ msgid "Hidden" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_id #: model:ir.model.fields,field_description:website_sale.field_product_public_category_id #: model:ir.model.fields,field_description:website_sale.field_product_style_id -#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_id_11056 +#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_id_11130 msgid "ID" msgstr "" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner -msgid "If you have an eCommerce, one of your objectives is of course to grow your revenues by\n" +msgid "If you have an e-Commerce, one of your objectives is of course to grow your revenues by\n" " selling more and pricier products. Luckily for you, Odoo integrates three powerful\n" " customizations for that." msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_image #: model:ir.model.fields,field_description:website_sale.field_product_public_category_image msgid "Image" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.view_product_image_form +msgid "Image Name" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_product_product_image_ids +#: model:ir.model.fields,field_description:website_sale.field_product_template_product_image_ids +#: model:ir.ui.view,arch_db:website_sale.product_template_form_view +msgid "Images" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Imagine a new customer who comes to your website, finds the product they want and add it to their cart.
    \n" @@ -1000,11 +1111,21 @@ msgid "Increase your chances to make a sale by displaying suggested products." msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:470 +#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_website_sale_options +msgid "Install the module website_sale_options" +msgstr "" + +#. module: website_sale +#: code:addons/website_sale/controllers/main.py:472 #, python-format msgid "Invalid Email! Please enter a valid email address." msgstr "" +#. module: website_sale +#: model:ir.model,name:website_sale.model_account_invoice +msgid "Invoice" +msgstr "" + #. module: website_sale #: model:ir.actions.act_window,name:website_sale.action_invoices_ecommerce #: model:ir.ui.menu,name:website_sale.menu_orders_invoices @@ -1028,6 +1149,7 @@ msgid "Landed Costs" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image___last_update #: model:ir.model.fields,field_description:website_sale.field_product_public_category___last_update #: model:ir.model.fields,field_description:website_sale.field_product_style___last_update #: model:ir.model.fields,field_description:website_sale.field_website_pricelist___last_update @@ -1040,6 +1162,7 @@ msgid "Last Online Sale Order" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_write_uid #: model:ir.model.fields,field_description:website_sale.field_product_public_category_write_uid #: model:ir.model.fields,field_description:website_sale.field_product_style_write_uid #: model:ir.model.fields,field_description:website_sale.field_website_pricelist_write_uid @@ -1047,6 +1170,7 @@ msgid "Last Updated by" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_write_date #: model:ir.model.fields,field_description:website_sale.field_product_public_category_write_date #: model:ir.model.fields,field_description:website_sale.field_product_style_write_date #: model:ir.model.fields,field_description:website_sale.field_website_pricelist_write_date @@ -1054,8 +1178,8 @@ msgid "Last Updated on" msgstr "" #. module: website_sale -#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form -msgid "Manage Deliveries" +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery +msgid "Manage shipping internally" msgstr "" #. module: website_sale @@ -1078,6 +1202,11 @@ msgstr "" msgid "More Info" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_website_multiimage +msgid "Multi Images" +msgstr "" + #. module: website_sale #. openerp-web #: code:addons/website_sale/static/src/js/website_sale.js:15 @@ -1086,6 +1215,7 @@ msgid "My Cart" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_name #: model:ir.model.fields,field_description:website_sale.field_product_public_category_name #: model:ir.ui.view,arch_db:website_sale.address msgid "Name" @@ -1093,7 +1223,7 @@ msgstr "" #. module: website_sale #. openerp-web -#: code:addons/website_sale/controllers/main.py:906 +#: code:addons/website_sale/controllers/main.py:951 #: code:addons/website_sale/static/src/js/website_sale.editor.js:18 #: model:ir.ui.view,arch_db:website_sale.content_new_product #, python-format @@ -1110,6 +1240,16 @@ msgstr "" msgid "No product defined." msgstr "" +#. module: website_sale +#: selection:website.config.settings,sale_delivery_settings:0 +msgid "No shipping management on website" +msgstr "" + +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "No, choose another method" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Now you can also import your existing products:" @@ -1144,16 +1284,36 @@ msgstr "" msgid "Once you click on Save, your product is updated." msgstr "" +#. module: website_sale +#: selection:website.config.settings,group_website_multiimage:0 +msgid "One image per product" +msgstr "" + +#. module: website_sale +#: selection:website.config.settings,module_website_sale_options:0 +msgid "One-step \"add to cart\"" +msgstr "" + #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_sale_order_only_services msgid "Only Services" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_options +msgid "Optional Products" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.confirmation msgid "Order" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_order_mail_template +msgid "Order Confirmation Email" +msgstr "" + #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_sale_order_website_order_line msgid "Order Lines displayed on Website" @@ -1181,8 +1341,8 @@ msgid "Partner" msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:719 -#: code:addons/website_sale/controllers/main.py:778 +#: code:addons/website_sale/controllers/main.py:725 +#: code:addons/website_sale/controllers/main.py:823 #, python-format msgid "Pay Now" msgstr "" @@ -1192,6 +1352,11 @@ msgstr "" msgid "Pay Now " msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "Payment" +msgstr "" + #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_sale_order_payment_acquirer_id msgid "Payment Acquirer" @@ -1217,6 +1382,24 @@ msgstr "" msgid "Payment Methods" msgstr "" +#. module: website_sale +#: code:addons/website_sale/controllers/main.py:756 +#, python-format +msgid "Payment transaction (%s) failed : <%s>" +msgstr "" + +#. module: website_sale +#: code:addons/website_sale/controllers/main.py:753 +#, python-format +msgid "Payment transaction failed (%s)" +msgstr "" + +#. module: website_sale +#: code:addons/website_sale/controllers/main.py:757 +#, python-format +msgid "Payment transaction failed (Contact Administrator)" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.extra_info_option #: model:ir.ui.view,arch_db:website_sale.wizard_checkout @@ -1260,6 +1443,11 @@ msgstr "" msgid "Pricelists" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_pricelist_setting_split_1 +msgid "Pricing Strategy" +msgstr "" + #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_product_product_purchase_requisition msgid "Procurement" @@ -1280,6 +1468,12 @@ msgstr "" msgid "Product Attribute" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.product_template_form_view +#: model:ir.ui.view,arch_db:website_sale.view_product_image_form +msgid "Product Images" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.product msgid "Product Name" @@ -1425,6 +1619,11 @@ msgstr "" msgid "Read the" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_image_product_tmpl_id +msgid "Related Product" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.404 msgid "Return to the product list." @@ -1457,6 +1656,11 @@ msgstr "" msgid "Sales Order" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_pricelist_setting_split_2 +msgid "Sales Price" +msgstr "" + #. module: website_sale #: model:ir.model,name:website_sale.model_crm_team #: model:ir.model.fields,field_description:website_sale.field_website_config_settings_salesteam_id @@ -1475,6 +1679,11 @@ msgstr "" msgid "Save and import the modified CSV file from the 'More' menu of the" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment +msgid "Save my payment data" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.cart msgid "Secure Payment" @@ -1523,8 +1732,17 @@ msgid "Sequence" msgstr "" #. module: website_sale -#: model:ir.ui.view,arch_db:website_sale.confirmation -#: model:ir.ui.view,arch_db:website_sale.payment +#: selection:website.config.settings,group_website_multiimage:0 +msgid "Several images per product" +msgstr "" + +#. module: website_sale +#: selection:website.config.settings,sale_pricelist_setting_split_1:0 +msgid "Several prices selectable through a drop-down list or applied automatically via Geo-IP" +msgstr "" + +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.bill_to msgid "Ship To:" msgstr "" @@ -1544,6 +1762,11 @@ msgstr "" msgid "Shipping Connectors" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_delivery_settings +msgid "Shipping Management" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.products #: model:website.menu,name:website_sale.menu_shop @@ -1555,6 +1778,11 @@ msgstr "" msgid "Shop - Checkout" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "Shop - Confirm payment" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.confirmation msgid "Shop - Confirmed" @@ -1570,6 +1798,21 @@ msgstr "" msgid "Shopping Cart" msgstr "" +#. module: website_sale +#: model:res.groups,name:website_sale.group_website_multi_image +msgid "Show multi image on e-Commerce" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_product_pricelist +msgid "Show pricelists On Products" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_pricelist_item +msgid "Show pricelists to customers" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address msgid "Sign Up" @@ -1618,7 +1861,7 @@ msgid "Some customers prefer to pay this way" msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:481 +#: code:addons/website_sale/controllers/main.py:483 #, python-format msgid "Some required fields are empty." msgstr "" @@ -1628,6 +1871,11 @@ msgstr "" msgid "Sorry, this product is not available anymore." msgstr "" +#. module: website_sale +#: selection:website.config.settings,sale_pricelist_setting_split_2:0 +msgid "Specific prices per customer segment, currency, etc." +msgstr "" + #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_product_product_split_method msgid "Split Method" @@ -1675,6 +1923,11 @@ msgstr "" msgid "Subtotal:" msgstr "" +#. module: website_sale +#: selection:website.config.settings,module_website_sale_options:0 +msgid "Suggest optional products when adding to cart (e.g. for a computer: warranty, software, etc.)" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.suggested_products_list msgid "Suggested Accessories:" @@ -1691,6 +1944,11 @@ msgstr "" msgid "Suggested Products:" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "Summary" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address msgid "TIN / VAT" @@ -1776,6 +2034,11 @@ msgstr "" msgid "Transaction" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "Transaction processing ..." +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Try to apply what you've learned above by manually creating three Product pages from the Content menu." @@ -1808,7 +2071,12 @@ msgstr "" #. module: website_sale #: model:ir.actions.act_window,name:website_sale.action_unpaid_orders_ecommerce -msgid "Unpaid eCommerce Orders" +msgid "Unpaid e-Commerce Orders" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_sale_pricelist +msgid "Use pricelists to adapt your price per customers" msgstr "" #. module: website_sale @@ -1883,7 +2151,7 @@ msgid "Website Pricelist" msgstr "" #. module: website_sale -#: code:addons/website_sale/models/sale_order.py:454 +#: code:addons/website_sale/models/sale_order.py:466 #, python-format msgid "Website Pricelist for %s" msgstr "" @@ -1938,6 +2206,18 @@ msgstr "" msgid "Website meta title" msgstr "" +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_product_website_price +#: model:ir.model.fields,field_description:website_sale.field_product_template_website_price +msgid "Website price" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_product_website_public_price +#: model:ir.model.fields,field_description:website_sale.field_product_template_website_public_price +msgid "Website public price" +msgstr "" + #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_crm_team_website_ids msgid "Websites" @@ -1948,6 +2228,11 @@ msgstr "" msgid "Websites using this sales team" msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm +msgid "Yes, pay with this card" +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "You can also define different prices for the variants you created by activating the 'Use pricelists to adapt your price per customers' option in" @@ -2011,6 +2296,11 @@ msgstr "" msgid "Your order has been confirmed, thank you for your loyalty." msgstr "" +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.order_state_message +msgid "Your payment has been authorized." +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.order_state_message msgid "Your payment has been received." @@ -2051,20 +2341,20 @@ msgstr "" msgid "comments" msgstr "" -#. module: website_sale -#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_sale_ebay -msgid "eBay connector" -msgstr "" - #. module: website_sale #: model:ir.ui.menu,name:website_sale.menu_ecommerce_settings #: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form -msgid "eCommerce" +msgid "e-Commerce" msgstr "" #. module: website_sale #: model:ir.actions.act_window,name:website_sale.action_orders_ecommerce -msgid "eCommerce Orders" +msgid "e-Commerce Orders" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_sale_ebay +msgid "eBay connector" msgstr "" #. module: website_sale @@ -2092,6 +2382,11 @@ msgstr "" msgid "product.attribute.value" msgstr "" +#. module: website_sale +#: model:ir.model,name:website_sale.model_product_image +msgid "product.image" +msgstr "" + #. module: website_sale #: model:ir.model,name:website_sale.model_product_style msgid "product.style" diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot index 6a7a5706349..a8702434222 100644 --- a/addons/website_sale_delivery/i18n/website_sale_delivery.pot +++ b/addons/website_sale_delivery/i18n/website_sale_delivery.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:27+0000\n" -"PO-Revision-Date: 2016-08-26 10:27+0000\n" +"POT-Creation-Date: 2016-09-05 14:12+0000\n" +"PO-Revision-Date: 2016-09-05 14:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -82,7 +82,7 @@ msgstr "" #. module: website_sale_delivery #: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form_website_delivery -msgid "Description displayed on the eCommerce and on online quotations." +msgid "Description displayed on the e-Commerce and on online quotations." msgstr "" #. module: website_sale_delivery @@ -124,6 +124,11 @@ msgstr "" msgid "Has delivery" msgstr "" +#. module: website_sale_delivery +#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_product_image_ids +msgid "Images" +msgstr "" + #. module: website_sale_delivery #: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_intrastat_id msgid "Intrastat code" @@ -271,3 +276,13 @@ msgstr "" msgid "Website meta title" msgstr "" +#. module: website_sale_delivery +#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_price +msgid "Website price" +msgstr "" + +#. module: website_sale_delivery +#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_public_price +msgid "Website public price" +msgstr "" + diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot index 9b21851aaaa..8b2681bb2d5 100644 --- a/odoo/addons/base/i18n/base.pot +++ b/odoo/addons/base/i18n/base.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0alpha1c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-26 10:26+0000\n" -"PO-Revision-Date: 2016-08-26 10:26+0000\n" +"POT-Creation-Date: 2016-09-05 14:10+0000\n" +"PO-Revision-Date: 2016-09-05 14:10+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -3270,16 +3270,16 @@ msgstr "" #. module: base #: code:addons/base/ir/ir_filters.py:36 -#: code:addons/base/res/res_partner.py:311 -#: code:addons/base/res/res_users.py:141 -#: code:addons/base/res/res_users.py:396 -#: code:addons/base/res/res_users.py:398 +#: code:addons/base/res/res_partner.py:320 +#: code:addons/base/res/res_users.py:143 +#: code:addons/base/res/res_users.py:404 +#: code:addons/base/res/res_users.py:406 #, python-format msgid "%s (copy)" msgstr "" #. module: base -#: code:addons/models.py:6210 +#: code:addons/models.py:5651 #, python-format msgid "%s This might be '%s' in the current model, or a field of the same name in an o2m." msgstr "" @@ -3295,7 +3295,7 @@ msgid "%y - Year without century [00,99].\"" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:1001 +#: code:addons/base/ir/ir_model.py:1007 #, python-format msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id" msgstr "" @@ -3329,11 +3329,6 @@ msgstr "" msgid "(edit)" msgstr "" -#. module: base -#: model:ir.ui.view,arch_db:base.view_company_form -msgid "(reload fonts)" -msgstr "" - #. module: base #: model:ir.ui.view,arch_db:base.wizard_lang_export msgid ", or your preferred text editor" @@ -3613,7 +3608,7 @@ msgid "Views" msgstr "" #. module: base -#: code:addons/models.py:3578 +#: code:addons/models.py:3269 #, python-format msgid "A document was modified since you last viewed it (%s:%d)" msgstr "" @@ -3742,11 +3737,14 @@ msgid "Access Menu" msgstr "" #. module: base +#: model:ir.ui.view,arch_db:base.edit_menu_access #: model:ir.ui.view,arch_db:base.view_groups_form +#: model:ir.ui.view,arch_db:base.view_model_fields_form #: model:ir.ui.view,arch_db:base.view_model_form #: model:ir.ui.view,arch_db:base.view_rule_form #: model:ir.ui.view,arch_db:base.view_users_form #: model:ir.ui.view,arch_db:base.view_users_simple_form +#: model:ir.ui.view,arch_db:base.view_view_form #: model:res.groups,name:base.group_erp_manager msgid "Access Rights" msgstr "" @@ -3804,7 +3802,6 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_accounting -#: model:ir.ui.view,arch_db:base.view_company_form msgid "Accounting" msgstr "" @@ -3860,7 +3857,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_url_help #: model:ir.model.fields,field_description:base.field_ir_act_window_help #: model:ir.model.fields,field_description:base.field_ir_actions_help -#: model:ir.model.fields,field_description:base.field_ir_actions_help_303 +#: model:ir.model.fields,field_description:base.field_ir_actions_help_304 msgid "Action Description" msgstr "" @@ -3894,7 +3891,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_url_type #: model:ir.model.fields,field_description:base.field_ir_act_window_type #: model:ir.model.fields,field_description:base.field_ir_actions_type -#: model:ir.model.fields,field_description:base.field_ir_actions_type_309 +#: model:ir.model.fields,field_description:base.field_ir_actions_type_310 #: model:ir.ui.view,arch_db:base.view_server_action_search msgid "Action Type" msgstr "" @@ -3911,7 +3908,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_url_usage #: model:ir.model.fields,field_description:base.field_ir_act_window_usage #: model:ir.model.fields,field_description:base.field_ir_actions_usage -#: model:ir.model.fields,field_description:base.field_ir_actions_usage_307 +#: model:ir.model.fields,field_description:base.field_ir_actions_usage_308 msgid "Action Usage" msgstr "" @@ -3945,6 +3942,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_model_access_active #: model:ir.model.fields,field_description:base.field_ir_rule_active #: model:ir.model.fields,field_description:base.field_ir_sequence_active +#: model:ir.model.fields,field_description:base.field_ir_ui_menu_active #: model:ir.model.fields,field_description:base.field_ir_ui_view_active #: model:ir.model.fields,field_description:base.field_res_bank_active #: model:ir.model.fields,field_description:base.field_res_currency_active @@ -4115,9 +4113,9 @@ msgid "Administrative divisions of a country. E.g. Fed. State, Departement, Cant msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:564 -#: code:addons/base/ir/ir_model.py:623 -#: code:addons/base/ir/ir_model.py:1107 +#: code:addons/base/ir/ir_model.py:578 +#: code:addons/base/ir/ir_model.py:637 +#: code:addons/base/ir/ir_model.py:1117 #, python-format msgid "Administrator access is required to uninstall a module" msgstr "" @@ -4155,11 +4153,6 @@ msgstr "" msgid "After Amount" msgstr "" -#. module: base -#: model:ir.ui.menu,name:base.menu_aftersale -msgid "After-Sale" -msgstr "" - #. module: base #: model:res.country,name:base.al msgid "Albania" @@ -4274,7 +4267,7 @@ msgid "Appears by default on the top right corner of your printed documents (rep msgstr "" #. module: base -#: code:addons/base/res/res_users.py:702 +#: code:addons/base/res/res_users.py:714 #: model:ir.model,name:base.model_ir_module_category #: model:ir.model.fields,field_description:base.field_ir_module_module_application #: model:ir.model.fields,field_description:base.field_res_groups_category_id @@ -4579,7 +4572,6 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form #: model:ir.model,name:base.model_res_partner_bank #: model:ir.model.fields,field_description:base.field_res_company_bank_ids -#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form #: model:ir.ui.view,arch_db:base.view_partner_bank_search #: model:ir.ui.view,arch_db:base.view_partner_bank_tree msgid "Bank Accounts" @@ -4615,7 +4607,6 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_res_bank_form #: model:ir.model.fields,field_description:base.field_res_partner_bank_ids #: model:ir.model.fields,field_description:base.field_res_users_bank_ids -#: model:ir.ui.menu,name:base.menu_action_res_bank_form #: model:ir.ui.view,arch_db:base.view_res_bank_tree msgid "Banks" msgstr "" @@ -4955,7 +4946,7 @@ msgid "Can not upgrade module '%s'. It is not installed." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:491 +#: code:addons/base/ir/ir_model.py:505 #, python-format msgid "Can only rename one field at a time!" msgstr "" @@ -5012,7 +5003,7 @@ msgid "Cannot duplicate configuration!" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:493 +#: code:addons/base/ir/ir_model.py:507 #, python-format msgid "Cannot rename field to %s, because that field already exists!" msgstr "" @@ -5039,11 +5030,6 @@ msgstr "" msgid "Category" msgstr "" -#. module: base -#: model:ir.model.fields,field_description:base.field_res_partner_category_name -msgid "Category Name" -msgstr "" - #. module: base #: model:res.country,name:base.ky msgid "Cayman Islands" @@ -5092,25 +5078,25 @@ msgid "Change the user password." msgstr "" #. module: base -#: code:addons/base/res/res_partner.py:324 +#: code:addons/base/res/res_partner.py:333 #, python-format msgid "Changing the company of a contact should only be done if it was never correctly set. If an existing contact starts working for a new company then a new contact should be created under that new company. You can use the \"Discard\" button to abandon this change." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:479 +#: code:addons/base/ir/ir_model.py:493 #, python-format msgid "Changing the model of a field is forbidden!" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:457 +#: code:addons/base/ir/ir_model.py:471 #, python-format msgid "Changing the storing system for field \"%s\" is not allowed." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:482 +#: code:addons/base/ir/ir_model.py:496 #, python-format msgid "Changing the type of a field is not yet supported. Please drop it and create it again!" msgstr "" @@ -5531,13 +5517,13 @@ msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_form msgid "Computed fields are defined with the fields\n" -" Dependencies and Compute." +" Dependencies and Compute." msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_fields_form msgid "Computed fields are defined with the fields\n" -" Dependencies and Compute." +" Dependencies and Compute." msgstr "" #. module: base @@ -5564,19 +5550,11 @@ msgid "Config Wizard Steps" msgstr "" #. module: base -#: model:ir.ui.menu,name:base.menu_event_config -#: model:ir.ui.menu,name:base.menu_marketing_config_association #: model:ir.ui.menu,name:base.menu_reporting_config #: model:ir.ui.view,arch_db:base.res_config_view_base -#: model:ir.ui.view,arch_db:base.view_company_form msgid "Configuration" msgstr "" -#. module: base -#: model:ir.ui.view,arch_db:base.view_company_form -msgid "Configuration (RML)" -msgstr "" - #. module: base #: model:ir.ui.view,arch_db:base.res_config_installer msgid "Configuration Installer" @@ -5765,7 +5743,7 @@ msgid "Costa Rica - Accounting" msgstr "" #. module: base -#: code:addons/base/res/res_partner.py:587 +#: code:addons/base/res/res_partner.py:596 #, python-format msgid "Couldn't create contact without email address!" msgstr "" @@ -5954,7 +5932,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_window_create_uid #: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_uid #: model:ir.model.fields,field_description:base.field_ir_actions_create_uid -#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid_300 +#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid_301 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_uid #: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_uid #: model:ir.model.fields,field_description:base.field_ir_cron_create_uid @@ -6024,7 +6002,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_window_create_date #: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_date #: model:ir.model.fields,field_description:base.field_ir_actions_create_date -#: model:ir.model.fields,field_description:base.field_ir_actions_create_date_308 +#: model:ir.model.fields,field_description:base.field_ir_actions_create_date_309 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_date #: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_date #: model:ir.model.fields,field_description:base.field_ir_cron_create_date @@ -6124,7 +6102,6 @@ msgstr "" #. module: base #: model:ir.actions.act_window,name:base.action_currency_form #: model:ir.actions.act_window,name:base.action_currency_form_company -#: model:ir.ui.menu,name:base.menu_action_currency_form #: model:ir.ui.view,arch_db:base.view_currency_search #: model:ir.ui.view,arch_db:base.view_currency_tree msgid "Currencies" @@ -6223,7 +6200,7 @@ msgid "Custom Shortcuts" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:430 +#: code:addons/base/ir/ir_model.py:444 #, python-format msgid "Custom fields must have a name that starts with 'x_' !" msgstr "" @@ -6322,7 +6299,7 @@ msgid "Database Structure" msgstr "" #. module: base -#: code:addons/models.py:3503 +#: code:addons/models.py:3194 #, python-format msgid "Database fetch misses ids ({}) and has extra ids ({}), may be caused by a type incoherence in a previous request" msgstr "" @@ -6639,7 +6616,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_window_display_name #: model:ir.model.fields,field_description:base.field_ir_act_window_view_display_name #: model:ir.model.fields,field_description:base.field_ir_actions_display_name -#: model:ir.model.fields,field_description:base.field_ir_actions_display_name_302 +#: model:ir.model.fields,field_description:base.field_ir_actions_display_name_303 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_display_name #: model:ir.model.fields,field_description:base.field_ir_attachment_display_name #: model:ir.model.fields,field_description:base.field_ir_autovacuum_display_name @@ -6755,8 +6732,8 @@ msgid "Document Management" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:770 -#: code:addons/base/ir/ir_model.py:773 +#: code:addons/base/ir/ir_model.py:784 +#: code:addons/base/ir/ir_model.py:787 #, python-format msgid "Document model" msgstr "" @@ -6872,28 +6849,24 @@ msgstr "" msgid "Edit Translations" msgstr "" -#. module: base -#: model:res.groups,name:base.group_website_publisher -msgid "Editor" -msgstr "" - -#. module: base -#: model:res.groups,name:base.group_website_designer -msgid "Editor and Designer" -msgstr "" - #. module: base #: model:res.country,name:base.eg msgid "Egypt" msgstr "" +#. module: base +#: model:ir.model.fields,help:base.field_res_partner_partner_share +#: model:ir.model.fields,help:base.field_res_users_partner_share +msgid "Either customer (no user), either shared user. Indicated the current partner is a customer without access or with a limited access created for sharing data." +msgstr "" + #. module: base #: model:res.country,name:base.sv msgid "El Salvador" msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:565 +#: code:addons/base/ir/ir_ui_view.py:572 #, python-format msgid "Element '%s' cannot be located in parent view" msgstr "" @@ -6948,16 +6921,11 @@ msgid "Employees" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:300 +#: code:addons/base/ir/ir_model.py:310 #, python-format msgid "Empty dependency in %r" msgstr "" -#. module: base -#: model:res.groups,name:base.group_hr_attendance_use_pin -msgid "Enable PIN use" -msgstr "" - #. module: base #: model:ir.ui.view,arch_db:base.view_server_action_form msgid "Enter Python code here. Help about Python expression is available in the help tab of this document." @@ -6968,11 +6936,6 @@ msgstr "" msgid "Equatorial Guinea" msgstr "" -#. module: base -#: model:res.groups,name:base.group_equipment_manager -msgid "Equipment Manager" -msgstr "" - #. module: base #: model:ir.module.module,shortdesc:base.module_maintenance msgid "Equipments" @@ -7002,26 +6965,26 @@ msgid "Error ! You cannot create recursive companies." msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:426 +#: code:addons/base/ir/ir_ui_view.py:433 #, python-format msgid "Error context:\n" "View `%(view_name)s`" msgstr "" #. module: base -#: code:addons/models.py:1233 +#: code:addons/models.py:1102 #, python-format msgid "Error details:" msgstr "" #. module: base -#: code:addons/models.py:1246 +#: code:addons/models.py:1115 #, python-format msgid "Error while validating constraint" msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_menu.py:80 +#: code:addons/base/ir/ir_ui_menu.py:81 #, python-format msgid "Error! You cannot create recursive menus." msgstr "" @@ -7172,7 +7135,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_url_xml_id #: model:ir.model.fields,field_description:base.field_ir_act_window_xml_id #: model:ir.model.fields,field_description:base.field_ir_actions_xml_id -#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id_301 +#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id_302 #: model:ir.model.fields,field_description:base.field_ir_module_category_xml_id #: model:ir.model.fields,field_description:base.field_ir_ui_view_xml_id #: model:ir.ui.view,arch_db:base.view_window_action_form @@ -7316,19 +7279,19 @@ msgid "Field" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:134 +#: code:addons/base/ir/ir_model.py:135 #, python-format msgid "Field \"Model\" cannot be modified on models." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:138 +#: code:addons/base/ir/ir_model.py:139 #, python-format msgid "Field \"Transient Model\" cannot be modified on models." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:136 +#: code:addons/base/ir/ir_model.py:137 #, python-format msgid "Field \"Type\" cannot be modified on models." msgstr "" @@ -7365,7 +7328,7 @@ msgid "Field Type" msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:877 +#: code:addons/base/ir/ir_ui_view.py:884 #, python-format msgid "Field `%(field_name)s` does not exist" msgstr "" @@ -7575,13 +7538,13 @@ msgid "For relationship fields, the technical name of the target model" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:423 +#: code:addons/base/ir/ir_model.py:437 #, python-format msgid "For selection fields, the Selection Options must be given!" msgstr "" #. module: base -#: code:addons/models.py:3638 +#: code:addons/models.py:3329 #, python-format msgid "For this kind of document, you may only access records you created yourself.\n" "\n" @@ -7736,7 +7699,6 @@ msgid "General Information" msgstr "" #. module: base -#: model:ir.ui.menu,name:base.menu_config #: model:ir.ui.view,arch_db:base.view_window_action_form msgid "General Settings" msgstr "" @@ -7805,7 +7767,7 @@ msgid "Glue module holding mail improvements for website." msgstr "" #. module: base -#: code:addons/base/res/res_config.py:661 +#: code:addons/base/res/res_config.py:663 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -7915,12 +7877,8 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_res_users_groups_id #: model:ir.ui.menu,name:base.menu_action_res_groups #: model:ir.ui.view,arch_db:base.config_wizard_step_view_form -#: model:ir.ui.view,arch_db:base.edit_menu_access #: model:ir.ui.view,arch_db:base.view_groups_form #: model:ir.ui.view,arch_db:base.view_groups_search -#: model:ir.ui.view,arch_db:base.view_model_fields_form -#: model:ir.ui.view,arch_db:base.view_model_form -#: model:ir.ui.view,arch_db:base.view_view_form msgid "Groups" msgstr "" @@ -8232,9 +8190,9 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_server_id #: model:ir.model.fields,field_description:base.field_ir_act_url_id #: model:ir.model.fields,field_description:base.field_ir_act_window_id -#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id_299 +#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id_300 #: model:ir.model.fields,field_description:base.field_ir_actions_id -#: model:ir.model.fields,field_description:base.field_ir_actions_id_310 +#: model:ir.model.fields,field_description:base.field_ir_actions_id_311 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_id #: model:ir.model.fields,field_description:base.field_ir_attachment_id #: model:ir.model.fields,field_description:base.field_ir_autovacuum_id @@ -8493,11 +8451,6 @@ msgstr "" msgid "Implementation" msgstr "" -#. module: base -#: model:ir.ui.menu,name:base.menu_import_crm -msgid "Import & Synchronize" -msgstr "" - #. module: base #: model:ir.ui.menu,name:base.menu_translation_export msgid "Import / Export" @@ -8692,13 +8645,13 @@ msgid "Instant Messaging Bus allow you to send messages to users, in live." msgstr "" #. module: base -#: code:addons/models.py:1448 +#: code:addons/models.py:1314 #, python-format msgid "Insufficient fields for Calendar View!" msgstr "" #. module: base -#: code:addons/models.py:1458 +#: code:addons/models.py:1324 #, python-format msgid "Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay" msgstr "" @@ -8765,7 +8718,7 @@ msgid "Introspection report on objects" msgstr "" #. module: base -#: code:addons/models.py:4559 +#: code:addons/models.py:4037 #, python-format msgid "Invalid \"order\" specified. A valid \"order\" specification is a comma-separated list of valid field names (optionally followed by asc/desc for the direction)" msgstr "" @@ -8795,21 +8748,7 @@ msgid "Invalid expression" msgstr "" #. module: base -#: code:addons/models.py:743 -#, python-format -msgid "Invalid function definition %s in object %s !\n" -"You must use the definition: store={object:(fnct, fields, priority, time length)}." -msgstr "" - -#. module: base -#: code:addons/models.py:2128 -#, python-format -msgid "Invalid group_by specification: \"%s\".\n" -"A group_by specification must be a list of valid fields." -msgstr "" - -#. module: base -#: code:addons/base/res/res_users.py:308 +#: code:addons/base/res/res_users.py:316 #, python-format msgid "Invalid groupby" msgstr "" @@ -8827,7 +8766,7 @@ msgid "Invalid model name %r in action definition." msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:557 +#: code:addons/base/ir/ir_ui_view.py:564 #, python-format msgid "Invalid position attribute: '%s'" msgstr "" @@ -8839,7 +8778,7 @@ msgid "Invalid prefix or suffix for sequence '%s'" msgstr "" #. module: base -#: code:addons/base/res/res_users.py:316 +#: code:addons/base/res/res_users.py:324 #, python-format msgid "Invalid search criterion" msgstr "" @@ -8851,8 +8790,8 @@ msgid "Invalid type" msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:296 -#: code:addons/base/ir/ir_ui_view.py:298 +#: code:addons/base/ir/ir_ui_view.py:297 +#: code:addons/base/ir/ir_ui_view.py:299 #, python-format msgid "Invalid view definition" msgstr "" @@ -8884,7 +8823,6 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_account -#: model:ir.ui.menu,name:base.menu_invoiced msgid "Invoicing" msgstr "" @@ -9173,7 +9111,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_window___last_update #: model:ir.model.fields,field_description:base.field_ir_act_window_view___last_update #: model:ir.model.fields,field_description:base.field_ir_actions___last_update -#: model:ir.model.fields,field_description:base.field_ir_actions___last_update_304 +#: model:ir.model.fields,field_description:base.field_ir_actions___last_update_305 #: model:ir.model.fields,field_description:base.field_ir_actions_todo___last_update #: model:ir.model.fields,field_description:base.field_ir_attachment___last_update #: model:ir.model.fields,field_description:base.field_ir_autovacuum___last_update @@ -9271,7 +9209,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_window_write_uid #: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_uid #: model:ir.model.fields,field_description:base.field_ir_actions_write_uid -#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid_305 +#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid_306 #: model:ir.model.fields,field_description:base.field_ir_attachment_write_uid #: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_uid #: model:ir.model.fields,field_description:base.field_ir_cron_write_uid @@ -9343,7 +9281,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_act_window_write_date #: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_date #: model:ir.model.fields,field_description:base.field_ir_actions_write_date -#: model:ir.model.fields,field_description:base.field_ir_actions_write_date_306 +#: model:ir.model.fields,field_description:base.field_ir_actions_write_date_307 #: model:ir.model.fields,field_description:base.field_ir_attachment_write_date #: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_date #: model:ir.model.fields,field_description:base.field_ir_cron_write_date @@ -9749,17 +9687,6 @@ msgstr "" msgid "Manage your debts and credits thanks to simple sale/purchase receipts" msgstr "" -#. module: base -#: model:res.groups,name:base.group_hr_manager -#: model:res.groups,name:base.group_survey_manager -msgid "Manager" -msgstr "" - -#. module: base -#: model:res.groups,name:base.group_hr_attendance -msgid "Manual Attendances" -msgstr "" - #. module: base #: model:ir.model.fields,help:base.field_ir_actions_todo_type msgid "Manual: Launched manually.\n" @@ -9770,7 +9697,6 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_manufacturing #: model:ir.module.module,shortdesc:base.module_mrp -#: model:ir.ui.menu,name:base.menu_mrp_root msgid "Manufacturing" msgstr "" @@ -9779,19 +9705,19 @@ msgstr "" msgid "Manufacturing Orders, Bill of Materials, Routings" msgstr "" -#. module: base -#: code:addons/models.py:2858 -#, python-format -msgid "Many2Many destination model does not exist: `%s`" -msgstr "" - #. module: base #: selection:ir.property,type:0 msgid "Many2One" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:437 +#: code:addons/fields.py:2263 +#, python-format +msgid "Many2many comodel does not exist: %r" +msgstr "" + +#. module: base +#: code:addons/base/ir/ir_model.py:451 #, python-format msgid "Many2one %s on model %s does not exist!" msgstr "" @@ -9881,11 +9807,6 @@ msgstr "" msgid "Medium-sized image of this contact. It is automatically resized as a 128x128px image, with aspect ratio preserved. Use this field in form views or some kanban views." msgstr "" -#. module: base -#: model:ir.ui.menu,name:base.menu_association -msgid "Members" -msgstr "" - #. module: base #: model:ir.module.module,shortdesc:base.module_membership msgid "Membership Management" @@ -10001,19 +9922,19 @@ msgid "Missing SMTP Server" msgstr "" #. module: base -#: code:addons/models.py:3607 +#: code:addons/models.py:3298 #, python-format msgid "Missing document(s)" msgstr "" #. module: base -#: code:addons/models.py:6195 +#: code:addons/models.py:5636 #, python-format msgid "Missing required value for the field '%s' (%s)" msgstr "" #. module: base -#: code:addons/models.py:6192 +#: code:addons/models.py:5633 #, python-format msgid "Missing required value for the field '%s'." msgstr "" @@ -10058,13 +9979,13 @@ msgid "Model" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:433 +#: code:addons/base/ir/ir_model.py:447 #, python-format msgid "Model %s does not exist!" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:114 +#: code:addons/base/ir/ir_model.py:115 #, python-format msgid "Model '%s' contains module data and cannot be removed!" msgstr "" @@ -10127,8 +10048,8 @@ msgid "Model name on which the method to be called is located, e.g. 'res.partner msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:666 -#: code:addons/base/ir/ir_ui_view.py:828 +#: code:addons/base/ir/ir_ui_view.py:673 +#: code:addons/base/ir/ir_ui_view.py:835 #, python-format msgid "Model not found: %(model)s" msgstr "" @@ -10327,7 +10248,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_act_report_xml_name #: model:ir.model.fields,field_description:base.field_ir_actions_name -#: model:ir.model.fields,field_description:base.field_ir_actions_name_311 +#: model:ir.model.fields,field_description:base.field_ir_actions_name_312 #: model:ir.model.fields,field_description:base.field_ir_actions_todo_name #: model:ir.model.fields,field_description:base.field_ir_cron_name #: model:ir.model.fields,field_description:base.field_ir_logging_name @@ -10435,7 +10356,7 @@ msgid "New Zealand - Accounting" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:495 +#: code:addons/base/ir/ir_model.py:509 #, python-format msgid "New field name must still start with x_ , because it is a custom field!" msgstr "" @@ -10496,7 +10417,7 @@ msgid "Niue" msgstr "" #. module: base -#: code:addons/models.py:1556 +#: code:addons/models.py:1422 #, python-format msgid "No default view of type '%s' could be found !" msgstr "" @@ -10506,6 +10427,12 @@ msgstr "" msgid "No gap" msgstr "" +#. module: base +#: code:addons/fields.py:2105 +#, python-format +msgid "No inverse field %r found for %r" +msgstr "" + #. module: base #: code:addons/base/module/wizard/base_update_translations.py:33 #, python-format @@ -10524,13 +10451,13 @@ msgid "Non Updatable" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:309 +#: code:addons/base/ir/ir_model.py:319 #, python-format msgid "Non-relational field %r in dependency %r" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:266 +#: code:addons/base/ir/ir_model.py:276 #, python-format msgid "Non-relational field name '%s' in related field '%s'" msgstr "" @@ -10681,11 +10608,6 @@ msgstr "" msgid "Odoo will automatically adds some '0' on the left of the 'Next Number' to get the required padding size." msgstr "" -#. module: base -#: model:res.groups,name:base.group_hr_user -msgid "Officer" -msgstr "" - #. module: base #: model:ir.module.module,description:base.module_payment_ogone #: model:ir.module.module,shortdesc:base.module_payment_ogone @@ -10719,19 +10641,19 @@ msgid "On delete property for many2one fields" msgstr "" #. module: base -#: code:addons/models.py:3607 +#: code:addons/models.py:3298 #, python-format msgid "One of the documents you are trying to access has been deleted, please try again after refreshing." msgstr "" #. module: base -#: code:addons/models.py:3993 +#: code:addons/models.py:3662 #, python-format msgid "One of the records you are trying to modify has already been deleted (Document type: %s)." msgstr "" #. module: base -#: code:addons/base/res/res_partner.py:367 +#: code:addons/base/res/res_partner.py:376 #, python-format msgid "One2Many fields cannot be synchronized as part of `commercial_fields` or `address fields`" msgstr "" @@ -10783,7 +10705,7 @@ msgid "Only applies if this view inherits from an other one (inherit_id is not F msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:770 +#: code:addons/base/ir/ir_model.py:784 #, python-format msgid "Only users with the following access level are currently allowed to do that" msgstr "" @@ -10826,7 +10748,7 @@ msgstr "" #: model:ir.model.fields,help:base.field_ir_act_url_help #: model:ir.model.fields,help:base.field_ir_act_window_help #: model:ir.model.fields,help:base.field_ir_actions_help -#: model:ir.model.fields,help:base.field_ir_actions_help_303 +#: model:ir.model.fields,help:base.field_ir_actions_help_304 msgid "Optional help text for the users with a description of the target view, such as its usage and purpose." msgstr "" @@ -10861,8 +10783,8 @@ msgid "Original View" msgstr "" #. module: base -#: code:addons/base/res/res_users.py:716 -#: code:addons/base/res/res_users.py:876 +#: code:addons/base/res/res_users.py:728 +#: code:addons/base/res/res_users.py:888 #, python-format msgid "Other" msgstr "" @@ -10896,13 +10818,13 @@ msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_form msgid "Other features are accessible through self, like\n" -" self.env, etc." +" self.env, etc." msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_fields_form msgid "Other features are accessible through self, like\n" -" self.env, etc." +" self.env, etc." msgstr "" #. module: base @@ -11070,11 +10992,6 @@ msgstr "" msgid "Partner" msgstr "" -#. module: base -#: model:ir.actions.act_window,name:base.action_partner_mass_mail -msgid "Partner Mass Mailing" -msgstr "" - #. module: base #: model:ir.module.module,summary:base.module_website_partner msgid "Partner Module for Website" @@ -11108,7 +11025,7 @@ msgid "Partners Geolocation" msgstr "" #. module: base -#: code:addons/base/res/res_partner.py:728 +#: code:addons/base/res/res_partner.py:737 #, python-format msgid "Partners: " msgstr "" @@ -11276,7 +11193,7 @@ msgid "Plano de contas SNC para Portugal" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:773 +#: code:addons/base/ir/ir_model.py:787 #, python-format msgid "Please contact your system administrator if you think this is an error." msgstr "" @@ -11310,7 +11227,7 @@ msgid "Please specify an action to launch!" msgstr "" #. module: base -#: code:addons/base/res/res_users.py:245 +#: code:addons/base/res/res_users.py:248 #, python-format msgid "Please use the change password wizard (in User Preferences or User menu) to change your own password." msgstr "" @@ -11435,7 +11352,6 @@ msgstr "" #. module: base #: model:ir.actions.report.xml,name:base.preview_rml_report -#: model:ir.ui.view,arch_db:base.view_company_form msgid "Preview RML Report" msgstr "" @@ -11456,6 +11372,12 @@ msgstr "" msgid "Priority" msgstr "" +#. module: base +#: code:addons/models.py:122 +#, python-format +msgid "Private methods (such as %s) cannot be called remotely." +msgstr "" + #. module: base #: model:ir.module.module,shortdesc:base.module_procurement msgid "Procurements" @@ -11501,7 +11423,6 @@ msgstr "" #: model:ir.module.category,name:base.module_category_project #: model:ir.module.category,name:base.module_category_project_management #: model:ir.module.module,shortdesc:base.module_project -#: model:ir.ui.menu,name:base.menu_main_pm msgid "Project" msgstr "" @@ -11523,7 +11444,7 @@ msgid "Properties" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:474 +#: code:addons/base/ir/ir_model.py:488 #, python-format msgid "Properties of base fields cannot be altered in this manner! Please modify them through Python code, preferably through a custom addon!" msgstr "" @@ -11607,7 +11528,6 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_purchase_management #: model:ir.module.category,name:base.module_category_purchases -#: model:ir.ui.menu,name:base.menu_purchase_root msgid "Purchases" msgstr "" @@ -11666,7 +11586,7 @@ msgid "Quotations, Sales Orders, Invoicing" msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:305 +#: code:addons/base/ir/ir_ui_view.py:306 #, python-format msgid "Qweb view cannot have 'Groups' define on the record. Use 'groups' atttributes inside the view definition" msgstr "" @@ -11761,14 +11681,14 @@ msgid "Record Rules" msgstr "" #. module: base -#: code:addons/base/ir/ir_cron.py:262 +#: code:addons/base/ir/ir_cron.py:266 #, python-format msgid "Record cannot be modified right now: This cron task is currently being executed and may not be modified Please try again in a few minutes" msgstr "" #. module: base #: code:addons/base/ir/ir_actions.py:353 -#: code:addons/models.py:4961 +#: code:addons/models.py:4422 #, python-format msgid "Record does not exist or has been deleted." msgstr "" @@ -11802,7 +11722,7 @@ msgid "Recursion found in child server actions" msgstr "" #. module: base -#: code:addons/models.py:4101 +#: code:addons/models.py:3768 #, python-format msgid "Recursivity Detected." msgstr "" @@ -11846,13 +11766,13 @@ msgid "Related Server Action" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:278 +#: code:addons/base/ir/ir_model.py:288 #, python-format msgid "Related field '%s' does not have comodel '%s'" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:276 +#: code:addons/base/ir/ir_model.py:286 #, python-format msgid "Related field '%s' does not have type '%s'" msgstr "" @@ -11908,7 +11828,7 @@ msgid "Remove the contextual action related to this server action" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:459 +#: code:addons/base/ir/ir_model.py:473 #, python-format msgid "Renaming sparse field \"%s\" is not allowed" msgstr "" @@ -11940,11 +11860,6 @@ msgstr "" msgid "Report" msgstr "" -#. module: base -#: model:ir.ui.view,arch_db:base.view_company_form -msgid "Report Configuration" -msgstr "" - #. module: base #: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_file msgid "Report File" @@ -11989,9 +11904,6 @@ msgstr "" #: model:ir.actions.act_window,name:base.ir_action_report_xml #: model:ir.model.fields,field_description:base.field_ir_module_module_reports_by_module #: model:ir.ui.menu,name:base.menu_ir_action_report_xml -#: model:ir.ui.menu,name:base.menu_project_report -#: model:ir.ui.menu,name:base.menu_sale_report -#: model:ir.ui.menu,name:base.purchase_report msgid "Reports" msgstr "" @@ -12014,7 +11926,7 @@ msgid "Resellers" msgstr "" #. module: base -#: code:addons/models.py:1064 +#: code:addons/models.py:935 #, python-format msgid "Resolve other errors first" msgstr "" @@ -12285,7 +12197,6 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_sales_team -#: model:ir.ui.menu,name:base.sales_team_config msgid "Sales Teams" msgstr "" @@ -12547,7 +12458,7 @@ msgid "Serialization Field" msgstr "" #. module: base -#: code:addons/models.py:428 +#: code:addons/models.py:354 #, python-format msgid "Serialization field `%s` not found for sparse field `%s`!" msgstr "" @@ -12599,15 +12510,13 @@ msgid "Set the font into the report header, it will be used as default font in t msgstr "" #. module: base -#: code:addons/base/res/res_users.py:511 +#: code:addons/base/res/res_users.py:524 #, python-format msgid "Setting empty passwords is not allowed for security reasons!" msgstr "" #. module: base #: model:ir.ui.menu,name:base.menu_administration -#: model:ir.ui.menu,name:base.menu_mrp_config -#: model:ir.ui.menu,name:base.menu_project_general_settings #: model:res.groups,name:base.group_system msgid "Settings" msgstr "" @@ -12622,6 +12531,12 @@ msgstr "" msgid "Share Group" msgstr "" +#. module: base +#: model:ir.model.fields,field_description:base.field_res_partner_partner_share +#: model:ir.model.fields,field_description:base.field_res_users_partner_share +msgid "Share Partner" +msgstr "" + #. module: base #: model:ir.model.fields,field_description:base.field_res_users_share msgid "Share User" @@ -12767,25 +12682,25 @@ msgstr "" #. module: base #: code:addons/base/ir/ir_attachment.py:288 -#: code:addons/base/ir/ir_model.py:764 +#: code:addons/base/ir/ir_model.py:778 #, python-format msgid "Sorry, you are not allowed to access this document." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:766 +#: code:addons/base/ir/ir_model.py:780 #, python-format msgid "Sorry, you are not allowed to create this kind of document." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:767 +#: code:addons/base/ir/ir_model.py:781 #, python-format msgid "Sorry, you are not allowed to delete this document." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:765 +#: code:addons/base/ir/ir_model.py:779 #, python-format msgid "Sorry, you are not allowed to modify this document." msgstr "" @@ -12796,7 +12711,7 @@ msgid "Sort" msgstr "" #. module: base -#: code:addons/models.py:4694 +#: code:addons/models.py:4170 #, python-format msgid "Sorting field %s not found on model %s" msgstr "" @@ -12891,11 +12806,6 @@ msgstr "" msgid "Sri Lanka" msgstr "" -#. module: base -#: model:ir.ui.menu,name:base.menu_project_config_project -msgid "Stages" -msgstr "" - #. module: base #: selection:ir.sequence,implementation:0 msgid "Standard" @@ -12929,12 +12839,6 @@ msgstr "" msgid "State Name" msgstr "" -#. module: base -#: code:addons/base/res/res_country.py:138 -#, python-format -msgid "State with id [%s] (%s) seems to have duplicated code: %s" -msgstr "" - #. module: base #: model:ir.model.fields,field_description:base.field_res_country_state_ids msgid "States" @@ -13233,7 +13137,12 @@ msgid "Tag" msgstr "" #. module: base -#: model:ir.model.fields,field_description:base.field_res_partner_category_id_966 +#: model:ir.model.fields,field_description:base.field_res_partner_category_name +msgid "Tag Name" +msgstr "" + +#. module: base +#: model:ir.model.fields,field_description:base.field_res_partner_category_id_968 #: model:ir.model.fields,field_description:base.field_res_users_category_id msgid "Tags" msgstr "" @@ -13352,6 +13261,7 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_tests +#: model:ir.ui.menu,name:base.menu_tests msgid "Tests" msgstr "" @@ -13388,7 +13298,7 @@ msgid "The ISO country code in two chars. \n" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:249 +#: code:addons/base/ir/ir_model.py:259 #, python-format msgid "The Selection Options expression is not a valid Pythonic expression.Please provide an expression in the [('key','Label'), ...] format." msgstr "" @@ -13422,7 +13332,7 @@ msgid "The active field allows you to hide the category without removing it." msgstr "" #. module: base -#: code:addons/base/res/res_users.py:277 +#: code:addons/base/res/res_users.py:285 #, python-format msgid "The chosen company is not in the allowed companies for this user" msgstr "" @@ -13480,35 +13390,35 @@ msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_form msgid "The field Compute is the Python code to\n" -" compute the value of the field on a set of records. The value of\n" -" the field must be assigned to each record with a dictionary-like\n" -" assignment." +" compute the value of the field on a set of records. The value of\n" +" the field must be assigned to each record with a dictionary-like\n" +" assignment." msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_fields_form msgid "The field Compute is the Python code to\n" -" compute the value of the field on a set of records. The value of\n" -" the field must be assigned to each record with a dictionary-like\n" -" assignment." +" compute the value of the field on a set of records. The value of\n" +" the field must be assigned to each record with a dictionary-like\n" +" assignment." msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_form msgid "The field Dependencies lists the fields that\n" -" the current field depends on. It is a comma-separated list of\n" -" field names, like name, size. You can also refer to\n" -" fields accessible through other relational fields, for instance\n" -" partner_id.company_id.name." +" the current field depends on. It is a comma-separated list of\n" +" field names, like name, size. You can also refer to\n" +" fields accessible through other relational fields, for instance\n" +" partner_id.company_id.name." msgstr "" #. module: base #: model:ir.ui.view,arch_db:base.view_model_fields_form msgid "The field Dependencies lists the fields that\n" -" the current field depends on. It is a comma-separated list of\n" -" field names, like name, size. You can also refer to\n" -" fields accessible through other relational fields, for instance\n" -" partner_id.company_id.name." +" the current field depends on. It is a comma-separated list of\n" +" field names, like name, size. You can also refer to\n" +" fields accessible through other relational fields, for instance\n" +" partner_id.company_id.name." msgstr "" #. module: base @@ -13549,13 +13459,13 @@ msgid "The menu action this filter applies to. When left empty the filter applie msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:82 +#: code:addons/base/ir/ir_model.py:83 #, python-format msgid "The model name can only contain lowercase characters, digits, underscores and dots." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:80 +#: code:addons/base/ir/ir_model.py:81 #, python-format msgid "The model name must start with 'x_'." msgstr "" @@ -13576,7 +13486,7 @@ msgid "The name of the country must be unique !" msgstr "" #. module: base -#: code:addons/base/res/res_users.py:148 +#: code:addons/base/res/res_users.py:150 #, python-format msgid "The name of the group can not start with \"-\"" msgstr "" @@ -13654,9 +13564,9 @@ msgid "The record id this is attached to." msgstr "" #. module: base -#: code:addons/models.py:3249 -#: code:addons/models.py:3512 -#: code:addons/models.py:3597 +#: code:addons/models.py:2987 +#: code:addons/models.py:3203 +#: code:addons/models.py:3288 #, python-format msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n" "\n" @@ -13679,7 +13589,7 @@ msgid "The state code." msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:361 +#: code:addons/base/ir/ir_model.py:372 #, python-format msgid "The table %r if used for other, possibly incompatible fields." msgstr "" @@ -13695,22 +13605,7 @@ msgid "The user this filter is private to. When left empty the filter is public msgstr "" #. module: base -#: model:res.groups,comment:base.group_equipment_manager -msgid "The user will be able to manage equipments." -msgstr "" - -#. module: base -#: model:res.groups,comment:base.group_hr_attendance -msgid "The user will gain access to the human resources attendance menu, enabling him to manage his own attendance." -msgstr "" - -#. module: base -#: model:res.groups,comment:base.group_hr_attendance_use_pin -msgid "The user will have to enter his PIN to check in and out manually at the company screen." -msgstr "" - -#. module: base -#: code:addons/models.py:6207 +#: code:addons/models.py:5648 #, python-format msgid "The value for the field '%s' already exists." msgstr "" @@ -13727,17 +13622,11 @@ msgid "There is already a shared filter set as default for %(model)s, delete or msgstr "" #. module: base -#: code:addons/models.py:2716 +#: code:addons/models.py:2542 #, python-format msgid "There is no reference available for %s" msgstr "" -#. module: base -#: code:addons/models.py:2841 -#, python-format -msgid "There is no reference field '%s' found for '%s'" -msgstr "" - #. module: base #: model:ir.model.fields,help:base.field_res_lang_iso_code msgid "This ISO code is the name of po files to use for translations" @@ -13749,7 +13638,7 @@ msgid "This Window" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:401 +#: code:addons/base/ir/ir_model.py:415 #, python-format msgid "This column contains module data and cannot be removed!" msgstr "" @@ -14212,7 +14101,7 @@ msgid "Ukraine" msgstr "" #. module: base -#: code:addons/models.py:3719 +#: code:addons/models.py:3409 #, python-format msgid "Unable to delete this document because it is used as a default property" msgstr "" @@ -14279,25 +14168,25 @@ msgid "Unknown" msgstr "" #. module: base -#: code:addons/models.py:1198 +#: code:addons/models.py:1069 #, python-format msgid "Unknown database identifier '%s'" msgstr "" #. module: base -#: code:addons/models.py:1063 +#: code:addons/models.py:934 #, python-format msgid "Unknown error during import:" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:307 +#: code:addons/base/ir/ir_model.py:317 #, python-format msgid "Unknown field %r in dependency %r" msgstr "" #. module: base -#: code:addons/base/ir/ir_model.py:264 +#: code:addons/base/ir/ir_model.py:274 #, python-format msgid "Unknown field name '%s' in related field '%s'" msgstr "" @@ -14477,7 +14366,6 @@ msgstr "" #: model:ir.ui.view,arch_db:base.ir_cron_view_search #: model:ir.ui.view,arch_db:base.ir_filters_view_search #: model:ir.ui.view,arch_db:base.view_users_search -#: model:res.groups,name:base.group_survey_user msgid "User" msgstr "" @@ -14776,9 +14664,9 @@ msgstr "" #. module: base #: code:addons/base/ir/ir_mail_server.py:474 -#: code:addons/base/ir/ir_model.py:286 -#: code:addons/base/ir/ir_model.py:360 -#: code:addons/base/res/res_partner.py:323 +#: code:addons/base/ir/ir_model.py:296 +#: code:addons/base/ir/ir_model.py:371 +#: code:addons/base/res/res_partner.py:332 #, python-format msgid "Warning" msgstr "" @@ -14790,7 +14678,7 @@ msgid "Warning!" msgstr "" #. module: base -#: code:addons/models.py:5923 +#: code:addons/models.py:5368 #, python-format msgid "Warnings" msgstr "" @@ -15178,7 +15066,7 @@ msgid "You can either upload a file from your computer or copy/paste an internet msgstr "" #. module: base -#: code:addons/base/res/res_partner.py:476 +#: code:addons/base/res/res_partner.py:485 #, python-format msgid "You can not change the company as the partner/user has multiple user linked with different companies." msgstr "" @@ -15194,7 +15082,7 @@ msgid "You can not register two fonts with the same name" msgstr "" #. module: base -#: code:addons/base/res/res_users.py:374 +#: code:addons/base/res/res_users.py:382 #, python-format msgid "You can not remove the admin user as it is used internally for resources created by Odoo (updates, module installation, ...)" msgstr "" @@ -15215,19 +15103,19 @@ msgid "You can state here the usual format to use for the addresses belonging to msgstr "" #. module: base -#: code:addons/base/res/res_partner.py:306 +#: code:addons/base/res/res_partner.py:315 #, python-format msgid "You cannot create recursive Partner hierarchies." msgstr "" #. module: base -#: code:addons/base/res/res_users.py:333 +#: code:addons/base/res/res_users.py:341 #, python-format msgid "You cannot deactivate the admin user." msgstr "" #. module: base -#: code:addons/base/res/res_users.py:335 +#: code:addons/base/res/res_users.py:343 #, python-format msgid "You cannot deactivate the user you're currently logged in as." msgstr "" @@ -15329,6 +15217,12 @@ msgstr "" msgid "Zip" msgstr "" +#. module: base +#: model:ir.ui.view,arch_db:base.view_model_fields_form +#: model:ir.ui.view,arch_db:base.view_model_form +msgid "[('blue', 'Blue'),('yellow', 'Yellow')]" +msgstr "" + #. module: base #: model:ir.ui.view,arch_db:base.view_base_import_language msgid "_Import" @@ -15411,6 +15305,21 @@ msgstr "" msgid "done" msgstr "" +#. module: base +#: model:ir.module.module,shortdesc:base.module_website_sale +msgid "e-Commerce" +msgstr "" + +#. module: base +#: model:ir.module.module,shortdesc:base.module_website_sale_delivery +msgid "e-Commerce Delivery" +msgstr "" + +#. module: base +#: model:ir.module.module,shortdesc:base.module_website_sale_options +msgid "e-Commerce Optional Products" +msgstr "" + #. module: base #: model:ir.ui.view,arch_db:base.view_base_import_language msgid "e.g. English" @@ -15449,21 +15358,6 @@ msgstr "" msgid "e.g. www.odoo.com" msgstr "" -#. module: base -#: model:ir.module.module,shortdesc:base.module_website_sale -msgid "eCommerce" -msgstr "" - -#. module: base -#: model:ir.module.module,shortdesc:base.module_website_sale_delivery -msgid "eCommerce Delivery" -msgstr "" - -#. module: base -#: model:ir.module.module,shortdesc:base.module_website_sale_options -msgid "eCommerce Optional Products" -msgstr "" - #. module: base #: model:ir.ui.view,arch_db:base.view_users_simple_form msgid "email@yourcompany.com" @@ -15761,7 +15655,7 @@ msgid "log(message, level='info'): a logging function to create ir_logging recor msgstr "" #. module: base -#: code:addons/base/ir/ir_ui_view.py:423 +#: code:addons/base/ir/ir_ui_view.py:430 #, python-format msgid "n/a" msgstr "" @@ -15918,21 +15812,11 @@ msgstr "" msgid "test_convert" msgstr "" -#. module: base -#: model:res.groups,comment:base.group_hr_user -msgid "the user will be able to approve document created by employees." -msgstr "" - #. module: base #: model:res.groups,comment:base.group_user msgid "the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system." msgstr "" -#. module: base -#: model:res.groups,comment:base.group_hr_manager -msgid "the user will have an access to the human resources configuration as well as statistic reports." -msgstr "" - #. module: base #: model:ir.ui.view,arch_db:base.view_server_action_form msgid "time: Python time module"