diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 06a8d53451f..906337cccc1 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-21 14:07+0000\n" -"PO-Revision-Date: 2015-01-21 14:07+0000\n" +"POT-Creation-Date: 2015-10-15 06:40+0000\n" +"PO-Revision-Date: 2015-10-15 06:40+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgid "\n" "
\n" "

It is also possible to directly pay with Paypal:

\n" " \n" -" \n" +" \n" " \n" " % endif\n" " \n" @@ -95,11 +95,18 @@ msgid " * The 'Draft' status is used when a user is encoding a new and unconfirm msgstr "" #. module: account -#: code:addons/account/account.py:1468 +#: code:addons/account/account.py:1477 #, python-format msgid " Centralisation" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/js/account_widgets.js:521 +#, python-format +msgid " seconds" +msgstr "" + #. module: account #: field:analytic.entries.report,nbr:0 msgid "# Entries" @@ -1554,17 +1561,7 @@ msgstr "" #. module: account #: help:account.fiscal.position,auto_apply:0 -msgid "Apply automatically this fiscal position." -msgstr "" - -#. module: account -#: help:account.fiscal.position,country_group_id:0 -msgid "Apply only if delivery or invocing country match the group." -msgstr "" - -#. module: account -#: help:account.fiscal.position,country_id:0 -msgid "Apply only if delivery or invoicing country match." +msgid "Apply automatically this fiscal position if the conditions match." msgstr "" #. module: account @@ -1572,6 +1569,16 @@ msgstr "" msgid "Apply only if partner has a VAT number." msgstr "" +#. module: account +#: help:account.fiscal.position,country_group_id:0 +msgid "Apply when the shipping or invoicing country is in this country group, and no position matches the country directly." +msgstr "" + +#. module: account +#: help:account.fiscal.position,country_id:0 +msgid "Apply when the shipping or invoicing country matches. Takes precedence over positions matching on a country group." +msgstr "" + #. module: account #: view:validate.account.move:account.validate_account_move_view #: view:validate.account.move.lines:account.validate_account_move_line_view @@ -2497,6 +2504,13 @@ msgstr "" msgid "Choose Fiscal Year" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/js/account_widgets.js:1297 +#, python-format +msgid "Choose counterpart" +msgstr "" + #. module: account #: view:account.automatic.reconcile:account.account_automatic_reconcile_view1 #: view:account.bank.statement:account.view_bank_statement_form @@ -2914,7 +2928,7 @@ msgstr "" #. module: account #: field:account.fiscal.position,country_id:0 -msgid "Countries" +msgid "Country" msgstr "" #. module: account @@ -2968,6 +2982,13 @@ msgstr "" msgid "Create Refund" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/js/account_widgets.js:1294 +#, python-format +msgid "Create Write-off" +msgstr "" + #. module: account #: selection:account.invoice.refund,filter_refund:0 msgid "Create a draft refund" @@ -5841,11 +5862,18 @@ msgstr "" msgid "Keep empty to use the period of the validation(invoice) date." msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/js/account_widgets.js:1299 +#, python-format +msgid "Keep open" +msgstr "" + #. module: account #. openerp-web #: field:account.statement.operation.template,label:0 -#: code:addons/account/static/src/js/account_widgets.js:75 -#: code:addons/account/static/src/js/account_widgets.js:80 +#: code:addons/account/static/src/js/account_widgets.js:74 +#: code:addons/account/static/src/js/account_widgets.js:79 #: view:website:account.report_journal #: view:website:account.report_salepurchasejournal #, python-format @@ -8266,6 +8294,12 @@ msgstr "" msgid "Round per line" msgstr "" +#. module: account +#: code:addons/account/account_bank_statement.py:899 +#, python-format +msgid "Rounding error from currency conversion" +msgstr "" + #. module: account #: view:account.subscription:account.view_subscription_search #: selection:account.subscription,state:0 @@ -9518,6 +9552,16 @@ msgstr "" msgid "The commercial entity that will be used on Journal Entries for this invoice" msgstr "" +#. module: account +#: constraint:account.config.settings:0 +msgid "The company of the gain exchange rate account must be the same than the company selected." +msgstr "" + +#. module: account +#: constraint:account.config.settings:0 +msgid "The company of the loss exchange rate account must be the same than the company selected." +msgstr "" + #. module: account #: help:account.tax,type:0 msgid "The computation method for the tax amount." @@ -9544,6 +9588,11 @@ msgstr "" msgid "The fiscal position will determine taxes and accounts used for the partner." msgstr "" +#. module: account +#: view:account.config.settings:account.view_account_config_settings +msgid "The fiscal year is created when installing a Chart of Account." +msgstr "" + #. module: account #: constraint:account.aged.trial.balance:0 #: constraint:account.balance.report:0 @@ -9818,6 +9867,26 @@ msgstr "" msgid "This Year" msgstr "" +#. module: account +#: help:product.template,property_account_expense:0 +msgid "This account will be used for invoices instead of the default one to value expenses for the current product." +msgstr "" + +#. module: account +#: help:product.template,property_account_income:0 +msgid "This account will be used for invoices instead of the default one to value sales for the current product." +msgstr "" + +#. module: account +#: help:product.category,property_account_expense_categ:0 +msgid "This account will be used for invoices to value expenses." +msgstr "" + +#. module: account +#: help:product.category,property_account_income_categ:0 +msgid "This account will be used for invoices to value sales." +msgstr "" + #. module: account #: help:res.partner,property_account_payable:0 msgid "This account will be used instead of the default one as the payable account for the current partner" @@ -9828,18 +9897,6 @@ msgstr "" msgid "This account will be used instead of the default one as the receivable account for the current partner" msgstr "" -#. module: account -#: help:product.category,property_account_expense_categ:0 -#: help:product.template,property_account_expense:0 -msgid "This account will be used to value outgoing stock using cost price." -msgstr "" - -#. module: account -#: help:product.category,property_account_income_categ:0 -#: help:product.template,property_account_income:0 -msgid "This account will be used to value outgoing stock using sale price." -msgstr "" - #. module: account #: help:account.config.settings,module_account_budget:0 msgid "This allows accountants to manage analytic and crossovered budgets. Once the master budgets and the budgets are defined, the project managers can set the planned amount on each analytic account.\n" @@ -10066,7 +10123,7 @@ msgstr "" #. openerp-web #: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:36 #, python-format -msgid "Tip : Hit ctrl-enter to validate the whole sheet." +msgid "Tip : Hit ctrl-enter to reconcile all balanced items." msgstr "" #. module: account @@ -10823,13 +10880,19 @@ msgid "You can check this box to mark this journal item as a litigation with the msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1220 +#: code:addons/account/account_move_line.py:1246 #, python-format msgid "You can not add/modify entries in a closed period %s of journal %s." msgstr "" #. module: account -#: code:addons/account/account.py:1047 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:42 +#, python-format +msgid "You can not cancel closing entries if the 'End of Year Entries Journal' period is closed." +msgstr "" + +#. module: account +#: code:addons/account/account.py:1057 #, python-format msgid "You can not re-open a period which belongs to closed fiscal year" msgstr "" @@ -10866,7 +10929,7 @@ msgid "You can specify here the coefficient that will be used when consolidating msgstr "" #. module: account -#: code:addons/account/account.py:2273 +#: code:addons/account/account.py:2293 #, python-format msgid "You can specify year, month and date in the name of the model using the following labels:\n" "\n"