[MERGE] from trunk

bzr revid: rco@openerp.com-20120104125730-j2j7jhiwhmthssi8

1 files changed, 11 insertions, 9 deletions

diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index e7c3e867644..83bd09cc327 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2010-12-23 14:19+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-27 15:49+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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: 2011-12-23 07:09+0000\n"
+"X-Launchpad-Export-Date: 2011-12-28 05:21+0000\n"
 "X-Generator: Launchpad (build 14560)\n"
 
 #. module: analytic_user_function
@@ -25,12 +25,13 @@ msgstr "Proizvod"
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
+msgstr "Relaciona tabela između korisnika i proizvoda u analitičkom kontu"
 
 #. module: analytic_user_function
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Ne možete izmeniti unos u tabelama obeleženim kao Potvrđenim/Završenim"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -42,7 +43,7 @@ msgstr "Analitički konto"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "Korisnik/Proizvod Relac."
+msgstr "Korisnik/Proizvod Odnos"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,user_id:0
@@ -54,7 +55,7 @@ msgstr "Korisnik"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:96
@@ -62,6 +63,7 @@ msgstr ""
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Nema dodatnih troškova za nalog određenog za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:95
@@ -73,17 +75,17 @@ msgstr "Greška !"
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Niz Kontrolne kartice"
+msgstr "Niz kontrolne kartice"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
-msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
+msgstr "Korisnički proizvod za ovaj Analitički Konto"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"