[MERGE] from master

[odoo/odoo.git] / addons / analytic_contract_hr_expense / i18n / mk.po

diff --git a/addons/analytic_contract_hr_expense/i18n/mk.po b/addons/analytic_contract_hr_expense/i18n/mk.po
index affb667..2ec3db0 100644 (file)
--- a/addons/analytic_contract_hr_expense/i18n/mk.po
+++ b/addons/analytic_contract_hr_expense/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-11-06 12:43+0000\n"
+"Last-Translator: Tome Barbov <tome.barbov@eskon.com.mk>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 06:54+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-11-07 07:32+0000\n"
+"X-Generator: Launchpad (build 17231)\n"
 
 #. module: analytic_contract_hr_expense
 #: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
@@ -35,12 +35,12 @@ msgstr "Проценка на трошоци за фактурирање"
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:analytic_contract_hr_expense.account_analytic_account_form_expense_form
 msgid "Expenses"
-msgstr ""
+msgstr "Трошоци"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:analytic_contract_hr_expense.account_analytic_account_form_expense_form
 msgid "Expenses and Timesheet Invoicing Ratio"
-msgstr ""
+msgstr "Сооднос на трошоци и фактурирање по распоред"
 
 #. module: analytic_contract_hr_expense
 #: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:135
@@ -77,6 +77,8 @@ msgid ""
 "{'invisible': "
 "[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
 msgstr ""
+"{'invisible': "
+"[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:analytic_contract_hr_expense.account_analytic_account_form_expense_form
@@ -86,6 +88,10 @@ msgid ""
 "'invisible':[('invoice_on_timesheets','=',False), "
 "('charge_expenses','=',False)]}"
 msgstr ""
+"{'required': "
+"['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)], "
+"'invisible':[('invoice_on_timesheets','=',False), "
+"('charge_expenses','=',False)]}"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:analytic_contract_hr_expense.account_analytic_account_form_expense_form
@@ -93,6 +99,8 @@ msgid ""
 "{'required': "
 "['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
 msgstr ""
+"{'required': "
+"['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:analytic_contract_hr_expense.account_analytic_account_form_expense_form